Add first tags for Caracal

.github/workflows/stackhpc-all-in-one.yml

@@ -264,6 +264,28 @@ jobs:
         run: |
           docker image pull $KAYOBE_IMAGE
 
+      # Rocky 9 OVN deployments will fail when the hostname contains a '.'
+      - name: Fix hostname
+        run: |
+          docker run -t --rm \
+            -v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
+            -e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
+            ${{ steps.kayobe_image.outputs.kayobe_image }} \
+            /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/playbook-run.sh etc/kayobe/ansible/fix-hostname.yml
+        env:
+          KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
+
+      # Reboot to Apply hostname change
+      - name: Reboot
+        run: |
+          docker run -t --rm \
+            -v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
+            -e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
+            ${{ steps.kayobe_image.outputs.kayobe_image }} \
+            /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/playbook-run.sh etc/kayobe/ansible/reboot.yml -e reboot_with_bootstrap_user=true
+        env:
+          KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
+
       - name: Run growroot
         run: |
           docker run -t --rm \
@@ -304,10 +326,29 @@ jobs:
         env:
           KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
 
+      - name: Change rabbit queues from HA to Quorum
+        run: |
+          sed -i -e 's/om_enable_rabbitmq_high_availability: true/om_enable_rabbitmq_high_availability: false/' \
+                 -e 's/om_enable_rabbitmq_quorum_queues: false/om_enable_rabbitmq_quorum_queues: true/' \
+                 etc/kayobe/environments/ci-aio/kolla/globals.yml
+        if: inputs.upgrade
+
+      - name: Migrate RabbitMQ queues
+        run: |
+          docker run -t --rm \
+            -v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
+            -e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
+            ${{ steps.kayobe_image.outputs.kayobe_image }} \
+            /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/script-run.sh tools/rabbitmq-quorum-migration.sh
+        env:
+          KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
+        if: inputs.upgrade
+
       # If testing upgrade, checkout the current release branch
       # Stash changes to tracked files, and set clean=false to avoid removing untracked files.
+      # Revert changes to RabbitMQ Queue types to avoid a merge conflict
       - name: Stash config changes
-        run: git stash
+        run: git restore etc/kayobe/environments/ci-aio/kolla/globals.yml && git stash
         if: inputs.upgrade
 
       - name: Checkout current release config

doc/source/conf.py

@@ -122,10 +122,10 @@
 }
 
 extlinks = {
-    f"{project}-doc": (f"https://docs.openstack.org/{project}/{current_series}/", "%s documentation")
+    f"{project}-doc": (f"https://docs.openstack.org/{project}/{current_series}/%s", "%s documentation")
     for project in extlinks_projects
 }
-extlinks["skc-doc"] = (f"https://stackhpc-kayobe-config.readthedocs.io/en/stackhpc-{current_series}/", "%s documentation")
-extlinks["kayobe-renos"] = (f"https://docs.openstack.org/releasenotes/kayobe/{current_series}.html", "%s release notes")
-extlinks["kolla-ansible-renos"] = (f"https://docs.openstack.org/releasenotes/kolla-ansible/{current_series}.html", "%s release notes")
-extlinks["ceph-doc"] = (f"https://docs.ceph.com/en/{ceph_series}/", "%s documentation")
+extlinks["skc-doc"] = (f"https://stackhpc-kayobe-config.readthedocs.io/en/stackhpc-{current_series}/%s", "%s documentation")
+extlinks["kayobe-renos"] = (f"https://docs.openstack.org/releasenotes/kayobe/{current_series}.html%s", "%s release notes")
+extlinks["kolla-ansible-renos"] = (f"https://docs.openstack.org/releasenotes/kolla-ansible/{current_series}.html%s", "%s release notes")
+extlinks["ceph-doc"] = (f"https://docs.ceph.com/en/{ceph_series}/%s", "%s documentation")

etc/kayobe/ansible/fix-hostname.yml

@@ -1,6 +1,6 @@
 ---
-- name: Fix hostname on storage nodes for cephadm
-  hosts: storage
+- name: Ensure hostnames match inventory hostnames
+  hosts: fix-hostname
   gather_facts: false
   vars:
     ansible_user: "{{ bootstrap_user }}"

etc/kayobe/environments/ci-aio/inventory/groups

@@ -3,3 +3,6 @@
 [container-image-builders:children]
 # Build container images on the all-in-one controller.
 controllers
+
+[fix-hostname:children]
+controllers

etc/kayobe/environments/ci-multinode/inventory/groups

@@ -3,3 +3,6 @@
 [container-image-builders:children]
 # Build container images on the all-in-one controller.
 controllers
+
+[fix-hostname:children]
+storage

etc/kayobe/kolla-image-tags.yml

@@ -4,5 +4,8 @@
 # where the key is the OS distro and the value is the tag to deploy.
 kolla_image_tags:
   openstack:
-    rocky-9: 2024.1-rocky-9-placeholder
-    ubuntu-jammy: 2024.1-ubuntu-jammy-placeholder
+    rocky-9: 2024.1-rocky-9-20240725T165045
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20240725T165045
+  heat:
+    rocky-9: 2024.1-rocky-9-20240805T142526
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20240805T142526

etc/kayobe/kolla/globals.yml

@@ -22,11 +22,6 @@ kolla_image_tags:
 # Variables defining which tag to use for each container's image.
 {{ lookup('pipe', 'python3 ' ~ kayobe_config_path ~ '/../../tools/kolla-images.py list-tag-vars') }}
 
-#############################################################################
-# RabbitMQ
-
-om_enable_rabbitmq_high_availability: true
-
 #############################################################################
 # Monitoring and alerting related settings
 

etc/kayobe/stackhpc.yml

@@ -145,7 +145,11 @@ stackhpc_kolla_source_version: "stackhpc/{{ openstack_release }}"
 
 # Kolla Ansible source repository.
 stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"
-stackhpc_kolla_ansible_source_version: "stackhpc/{{ openstack_release }}"
+# FIXME: Waiting for
+# https://review.opendev.org/c/openstack/kolla-ansible/+/926198 to merge and
+# sync to stackhpc/2024.1
+# stackhpc_kolla_ansible_source_version: "stackhpc/{{ openstack_release }}"
+stackhpc_kolla_ansible_source_version: "fix-prometheus"
 
 ###############################################################################
 # Container image registry

releasenotes/config.yaml

@@ -1,4 +1,4 @@
 ---
-# This needs to be updated to the latest release.
-release_tag_re: stackhpc/14\.\d+\.\d+\.\d
+# NOTE(upgrade): This needs to be updated to the current release's major version.
+release_tag_re: stackhpc/16\.\d+\.\d+\.\d
 ignore_null_merges: false

releasenotes/notes/cve-2024-32498-2cbd205129351766.yaml

@@ -2,6 +2,6 @@
 critical:
   - |
     Fixes `CVE-2024-32498
-    <https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-32498>`_ with
+    <https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-32498>`__ with
     updated container images for Cinder, Glance and Nova services.
 

releasenotes/notes/kayobe-image-f1227adacb28f40b.yaml

@@ -2,7 +2,7 @@
 features:
   - |
     StackHPC Kayobe Configuration container images for CI/CD with `Kayobe
-    Automation <https://github.com/stackhpc/kayobe-automation>`_ are now
+    Automation <https://github.com/stackhpc/kayobe-automation>`__ are now
     published to GitHub Container Registry (GHCR) at
     ghcr.io/stackhpc/stackhpc-kayobe-config. The image is tagged with the name
     of the release branch, e.g. ``stackhpc/yoga``.

releasenotes/notes/magnum-capi-driver-2dd8cf6e68a1919c.yaml

@@ -1,4 +1,6 @@
 ---
 features:
   - |
-    Adds the new magnum-capi-helm out of tree driver (see here https://github.com/stackhpc/magnum-capi-helm) into release train magnum containers
+    Adds the new magnum-capi-helm out of tree driver (see here
+    https://github.com/stackhpc/magnum-capi-helm) into release train magnum
+    containers

releasenotes/notes/openstack-dash-ff7bf179e37c8e4b.yaml

@@ -1,5 +1,5 @@
 ---
 other:
   - |
-    Changes the Grafana OpenStack dashboard to show HTTP status 300 as green instead of
-    orange.
+    Changes the Grafana OpenStack dashboard to show HTTP status 300 as green
+    instead of orange.

releasenotes/notes/update-haproxy-dashboard-b8807c2a0645ca5e.yaml

@@ -3,4 +3,4 @@ features:
   - |
     The HAProxy dashboard and alerts have been updated to use the new metrics
     source in Kolla Ansible. For further details see `here
-    <https://review.opendev.org/c/openstack/kolla-ansible/+/877118`__.
+    <https://review.opendev.org/c/openstack/kolla-ansible/+/877118>`__.

releasenotes/notes/wallaby-c3c55c39c7b118f2.yaml

@@ -2,9 +2,9 @@
 features:
   - |
     Adds support for package repository snapshots via `Pulp
-    <https://pulpproject.org/>`_.  A local Pulp server is deployed on the seed,
+    <https://pulpproject.org/>`__.  A local Pulp server is deployed on the seed,
     which syncs package repositories and container images from the StackHPC
-    `Ark <https://ark.stackhpc.com>`_ Pulp server. Control plane servers pull
+    `Ark <https://ark.stackhpc.com>`__ Pulp server. Control plane servers pull
     packages and container images from the local Pulp server.
   - |
     The EPEL package repository is disabled by default. It may be enabled by

releasenotes/notes/xena-batch-bc1da4e4d0f6257e.yaml

@@ -2,7 +2,7 @@
 features:
   - |
     Adds a custom playbook to run the `Anomaly Detection Visualiser (ADVise)
-    <https://github.com/stackhpc/advise>`_, ``advise-run.yml``.
+    <https://github.com/stackhpc/advise>`__, ``advise-run.yml``.
   - |
     Adds a custom playbook to reset the RabbitMQ cluster and restart OpenStack
     services that use it, ``rabbitmq-reset.yml``.