Skip to content

Sync 2025.1 again - #2498

Merged
Alex-Welsh merged 32 commits into
stackhpc/2026.1from
sync-2025.1-again
Aug 7, 2026
Merged

Sync 2025.1 again#2498
Alex-Welsh merged 32 commits into
stackhpc/2026.1from
sync-2025.1-again

Conversation

@Alex-Welsh

Copy link
Copy Markdown
Member

No description provided.

jackhodgkiss and others added 30 commits July 17, 2026 12:21
Add alerts for `etcd` obtained from [1]

[1]: https://samber.github.io/awesome-prometheus-alerts/rules/orchestrators/etcd/

Signed-off-by: Jack Hodgkiss <jack@stackhpc.com>
Previously there was a hostname-related OVN bug that required a reboot
in the AIO CI instances to mitigate. It's been fixed for years[1] so
this change reverts the workaround. It'll speed up CI and it's better to
know if we regress.

[1] https://bugs.launchpad.net/kolla-ansible/+bug/2080552
The previous Rocky 9.8 host image came with broken python 3.9 which
caused issues starting deployments (`ASN1: NOT_ENOUGH_DATA`).
An updated python package was released[0] and the host image has been
rebuilt with this.

OFED kernel module has been built for the latest kernel this image
uses (`5.14.0.687.26.1.el9.8`).

0: https://errata.rockylinux.org/RLSA-2026:39798
Added Valkey migration script.
This checks how `kolla_enable_redis`` is evaluated.
If it's true, the script calls K-A's Valkey migration.
Otherwise, it's a NOOP.
The GitHub app using it was turned off last summer [1].

[1] https://github.com/apps/product-auto-label
This switches to an IPA builder fork which is required for centos-10
stream IPA images, which are required (currently) to provide a version
of qemu-img that can handle 4k sectors from Dell Perc RAID controllers
which don't support other block sizes.

Anyone not affected can carry on using stream-9 images until Rocky ones
exist.

We can drop this patch if we can backport
https://review.opendev.org/c/openstack/ironic-python-agent-builder/+/995589
Update kolla_base_distro_version_default_map to select Rocky 9
or Rocky 10 images for each host.
Add coderabbit review configuration
Also ensure that the playbook is safe to run on Ubuntu.
Add hook to reset-bls-entries after host package update
This reverts commit d6b67b6.

Reason for revert: fixes have been merged upstream.
Revert "GT-1835: Fix IPA for stream 10 (#2448)"
feat: add `prometheus` alerts for `etcd`
Signed-off-by: Jack Hodgkiss <jack@stackhpc.com>
feat: move release note to correct folder
This workflow should sync SKC with the upstream kayobe-config template.
Unfortunately, it has never workedm because it has a different structure
to standard openstack forks. Disabling it until we have time to properly
investigate it.
Bump repositories and rebuild OFED
Kayobe expects hooks to end with a .yml extension.
@Alex-Welsh
Alex-Welsh requested a review from a team as a code owner August 7, 2026 09:53
@github-actions github-actions Bot added the waiting-review PR is waiting for a review label Aug 7, 2026
@coderabbitai

coderabbitai Bot commented Aug 7, 2026

Copy link
Copy Markdown

Review Change Stack

📝 Walkthrough

Removed the upstream synchronisation workflow. Added embedded etcd Prometheus alerts and connected the BLS reset hook. Updated DOCA OFED kernel versions for Rocky Linux 9.8 and 10.2. Added release notes for etcd alerts, kernel and Docker Engine updates, and security fixes.

Walkthrough

The PR removes the upstream synchronisation workflow, adds embedded etcd Prometheus alerts, adds a BLS reset hook, updates Rocky Linux DOCA OFED versions, and adds release notes for monitoring, platform, and security updates.

Changes

Monitoring and platform maintenance

Layer / File(s) Summary
Embedded etcd alerting
etc/kayobe/kolla/config/prometheus/etcd.rules, releasenotes/notes/add-etcd-prometheus-alerts-f14710e37d97621f.yaml
Adds alert rules for embedded etcd availability, failures, latency, communication, proposals, storage, quorum, quota, growth, fragmentation, and fsync performance. Adds the related release note.
Host maintenance hook
etc/kayobe/hooks/overcloud-host-package-update/post.d/20-reset-bls-entries.yml
Adds a post-update symbolic link to the BLS reset maintenance task.
Platform version and release metadata
etc/kayobe/ofed.yml, releasenotes/notes/repo-bump-20260728-6cba5f6d572ebbfb.yaml, .github/workflows/upstream-sync.yml
Updates Rocky Linux 9.8 and 10.2 DOCA OFED kernel module versions. Records kernel and Docker Engine security updates. Removes the upstream synchronisation workflow.

Estimated code review effort: 3 (Moderate) | ~20 minutes

Possibly related PRs

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 4


ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: 34bf9806-e5ab-4c3f-bb24-ad1226887f20

📥 Commits

Reviewing files that changed from the base of the PR and between 47976e6 and e2b3486.

📒 Files selected for processing (6)
  • .github/workflows/upstream-sync.yml
  • etc/kayobe/hooks/overcloud-host-package-update/post.d/20-reset-bls-entries.yml
  • etc/kayobe/kolla/config/prometheus/etcd.rules
  • etc/kayobe/ofed.yml
  • releasenotes/notes/add-etcd-prometheus-alerts-f14710e37d97621f.yaml
  • releasenotes/notes/repo-bump-20260728-6cba5f6d572ebbfb.yaml
💤 Files with no reviewable changes (1)
  • .github/workflows/upstream-sync.yml
📜 Review details
⏰ Context from checks skipped due to timeout. (6)
  • GitHub Check: stackhpc/check
  • GitHub Check: Tox docs with Python 3.12
  • GitHub Check: Tox pep8 with Python 3.12
  • GitHub Check: Ansible 2.20 lint with Python 3.12
  • GitHub Check: Tox releasenotes with Python 3.12
  • GitHub Check: Ansible 2.19 lint with Python 3.12
🔇 Additional comments (10)
etc/kayobe/hooks/overcloud-host-package-update/post.d/20-reset-bls-entries.yml (1)

1-1: LGTM!

etc/kayobe/ofed.yml (1)

22-23: LGTM!

releasenotes/notes/repo-bump-20260728-6cba5f6d572ebbfb.yaml (1)

1-15: LGTM!

etc/kayobe/kolla/config/prometheus/etcd.rules (7)

16-32: LGTM!


34-54: LGTM!


56-65: LGTM!


97-131: LGTM!


151-167: LGTM!


169-186: LGTM!


4-6: 📐 Maintainability & Code Quality

Confirm that kolla-ansible copies etcd.rules.

This repository renders rule_files from an explicit prometheus_alert_rules.files list, but etc/kayobe/kolla/config/prometheus/etcd.rules is only present as a Kolla config file. There is no traceable registration in this repository for that file. If Kolla does not copy kolla/config/prometheus/*.rules and does not pass them as PROMETHEUS_RULE_FILES/prometheusAlertRules, these alerts never load.

Comment thread etc/kayobe/kolla/config/prometheus/etcd.rules
Comment thread etc/kayobe/kolla/config/prometheus/etcd.rules
Comment thread etc/kayobe/kolla/config/prometheus/etcd.rules
Comment thread releasenotes/notes/add-etcd-prometheus-alerts-f14710e37d97621f.yaml
@Alex-Welsh
Alex-Welsh merged commit e84caf2 into stackhpc/2026.1 Aug 7, 2026
12 of 13 checks passed
@Alex-Welsh
Alex-Welsh deleted the sync-2025.1-again branch August 7, 2026 10:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

waiting-review PR is waiting for a review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants