Merge branch 'stackhpc/master' into caracal-forward-port

seunghun1ee · web-flow · commit 03342b74c2bb · 2025-03-07T09:09:52.000Z
diff --git a/.github/workflows/stackhpc-all-in-one.yml b/.github/workflows/stackhpc-all-in-one.yml
@@ -335,46 +335,6 @@ jobs:
         env:
           KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
 
-      - name: Upgrade to RabbitMQ 3.12
-        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/kolla-ansible-run.sh "rabbitmq-upgrade 3.12"
-        env:
-          KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
-        if: inputs.upgrade
-
-      - name: Upgrade to RabbitMQ 3.13
-        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/kolla-ansible-run.sh "rabbitmq-upgrade 3.13"
-        env:
-          KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
-        if: inputs.upgrade
-
-      - 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
@@ -407,15 +367,13 @@ jobs:
           KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
         if: inputs.upgrade
 
-      # NOTE(Alex-Welsh): configure host with selinux_state=disabled, because
-      # Antelope images are not built as permissive
       - name: Host configure
         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 \
             $KAYOBE_IMAGE \
-            /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/overcloud-host-configure.sh -e selinux_state=disabled
+            /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/overcloud-host-configure.sh
         env:
           KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
         if: inputs.upgrade
@@ -431,20 +389,6 @@ jobs:
           KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
         if: inputs.upgrade
 
-      - name: Ensure we have IP on breth1 to reach the instances
-        # NOTE(wszumski): Whilst we don't need to create resources again, in some circumstances
-        # we can lose the IP address that allows us to connect to the instances. This playbook
-        # also fixes that issue.
-        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/configure-aio-resources.yml
-        env:
-          KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
-        if: inputs.upgrade
-
       - name: Tempest tests
         id: tempest
         run: |
diff --git a/.github/workflows/stackhpc-pull-request.yml b/.github/workflows/stackhpc-pull-request.yml
@@ -115,17 +115,17 @@ jobs:
       if: ${{ needs.check-changes.outputs.build-kayobe-image == 'true' }}
     if: github.repository == 'stackhpc/stackhpc-kayobe-config'
 
-  # check-tags:
-  #   name: Check container image tags
-  #   needs:
-  #     - check-changes
-  #     - build-kayobe-image
-  #   uses: ./.github/workflows/stackhpc-check-tags.yml
-  #   with:
-  #     kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
-  #     if: ${{ needs.check-changes.outputs.check-tags == 'true' }}
-  #   secrets: inherit
-  #   if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
+  check-tags:
+    name: Check container image tags
+    needs:
+      - check-changes
+      - build-kayobe-image
+    uses: ./.github/workflows/stackhpc-check-tags.yml
+    with:
+      kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
+      if: ${{ needs.check-changes.outputs.check-tags == 'true' }}
+    secrets: inherit
+    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
 
   all-in-one-ubuntu-noble-ovs:
     name: aio (Ubuntu Noble OVS)
@@ -197,6 +197,7 @@ jobs:
 
   # Test two upgrade scenarios: Ubuntu Noble OVS and Rocky 9 OVN.
 
+  # On hold until Noble support lands in stackhpc/2024.1
   # all-in-one-upgrade-ubuntu-noble-ovs:
   #   name: aio upgrade (Ubuntu Noble OVS)
   #   needs:
@@ -215,20 +216,20 @@ jobs:
   #   secrets: inherit
   #   if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
 
-  # all-in-one-upgrade-rocky-9-ovn:
-  #   name: aio upgrade (Rocky 9 OVN)
-  #   needs:
-  #     - check-changes
-  #     - build-kayobe-image
-  #   uses: ./.github/workflows/stackhpc-all-in-one.yml
-  #   with:
-  #     kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
-  #     os_distribution: rocky
-  #     os_release: "9"
-  #     ssh_username: cloud-user
-  #     neutron_plugin: ovn
-  #     OS_CLOUD: openstack
-  #     if: ${{ needs.check-changes.outputs.aio == 'true' }}
-  #     upgrade: true
-  #   secrets: inherit
-  #   if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
+  all-in-one-upgrade-rocky-9-ovn:
+    name: aio upgrade (Rocky 9 OVN)
+    needs:
+      - check-changes
+      - build-kayobe-image
+    uses: ./.github/workflows/stackhpc-all-in-one.yml
+    with:
+      kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
+      os_distribution: rocky
+      os_release: "9"
+      ssh_username: cloud-user
+      neutron_plugin: ovn
+      OS_CLOUD: openstack
+      if: ${{ needs.check-changes.outputs.aio == 'true' }}
+      upgrade: true
+    secrets: inherit
+    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -8,9 +8,9 @@ version: 2
 build:
   apt_packages:
     - tox
-  os: ubuntu-22.04
+  os: ubuntu-24.04
   tools:
-    python: "3.7"
+    python: "3.12"
   jobs:
     post_checkout:
       - git remote set-branches origin master stackhpc/master stackhpc/2024.1 stackhpc/2023.1 stackhpc/zed stackhpc/yoga stackhpc/xena stackhpc/wallaby
diff --git a/doc/source/configuration/host-images.rst b/doc/source/configuration/host-images.rst
@@ -20,7 +20,7 @@ in ``etc/kayobe/stackhpc-overcloud-host-images.yml``.
 Currently, images exist for the following operating systems:
 
 * Rocky Linux 9
-* Ubuntu Jammy 22.04
+* Ubuntu Noble 24.04
 
 The image to download is selected automatically using the ``os_distribution``
 and ``os_release`` variables. These images are versioned and a variable for
diff --git a/doc/source/configuration/ipa.rst b/doc/source/configuration/ipa.rst
@@ -27,9 +27,9 @@ post configure`` for Overcloud Ironic. This behaviour can be disabled in
 
 You can also override the distribution version pulled in during deployment,
 to do this you can change ``stackhpc_ipa_image_version`` to be the opposite
-distribution. For example, the case of switching to Ubuntu 22.04 on a Rocky 9
+distribution. For example, the case of switching to Ubuntu 24.04 on a Rocky 9
 cloud:
 
 .. code-block:: yaml
 
-    stackhpc_ipa_image_version: "{{ stackhpc_ubuntu_jammy_ipa_image_version }}"
+    stackhpc_ipa_image_version: "{{ stackhpc_ubuntu_noble_ipa_image_version }}"
diff --git a/doc/source/configuration/release-train.rst b/doc/source/configuration/release-train.rst
@@ -39,7 +39,7 @@ Configuration
 This configuration provides the following:
 
 * Configuration to deploy a local Pulp service as a container on the seed
-* Pulp repository definitions for Rocky Linux 9 and Ubuntu Jammy 22.04
+* Pulp repository definitions for Rocky Linux 9 and Ubuntu Noble 24.04
 * Playbooks to synchronise a local Pulp service with Ark
 * Configuration to use the local Pulp repository mirrors on control plane hosts
 * Configuration to use the local Pulp container registry on control plane hosts
@@ -81,7 +81,7 @@ The Ark pulp credentials issued by StackHPC should be configured in
 Package repositories
 --------------------
 
-Rocky Linux 9 and Ubuntu Jammy package repositories are synced based on the
+Rocky Linux 9 and Ubuntu Noble package repositories are synced based on the
 value of ``os_distribution`` and ``os_release``.
 
 On Ark, each package repository provides versioned snapshots using a datetime
@@ -93,7 +93,7 @@ repository.
 Package managers
 ----------------
 
-For Ubuntu Jammy systems, the package manager configuration is provided by
+For Ubuntu Noble systems, the package manager configuration is provided by
 ``stackhpc_apt_repositories`` in ``etc/kayobe/apt.yml``.
 
 The configuration is applied by default to all Ubuntu hosts. The configuration
@@ -110,7 +110,7 @@ including i18n files and command-not-found indices. This breaks APT when the
 
 .. code:: console
 
-   E: Failed to fetch https://pulp.example.com/pulp/content/ubuntu/jammy-security/development/dists/jammy-security/main/cnf/Commands-amd64   404  Not Found
+   E: Failed to fetch https://pulp.example.com/pulp/content/ubuntu/noble-security/development/dists/noble-security/main/cnf/Commands-amd64   404  Not Found
 
 The ``purge-command-not-found.yml`` custom playbook can be used to uninstall
 the package, prior to running any other APT commands. It may be installed as a
diff --git a/doc/source/configuration/security-hardening.rst b/doc/source/configuration/security-hardening.rst
@@ -12,7 +12,7 @@ improvement over an unhardened system. A typical score would be 70%.
 
 The following operating systems are supported:
 
-- Ubuntu 22.04
+- Ubuntu 24.04
 - Rocky 9
 
 Configuration
@@ -25,7 +25,7 @@ instance, you may want different rules on a network node compared to a
 controller. It is best to consult the upstream role documentation for details
 about what each variable does. The documentation can be found here:
 
-- `Ubuntu 22.04 <https://github.com/ansible-lockdown/UBUNTU22-CIS>`__
+- `Ubuntu 24.04 <https://github.com/ansible-lockdown/UBUNTU24-CIS>`__
 - `Rocky 9 <https://github.com/ansible-lockdown/RHEL9-CIS>`__
 
 Running the playbooks
diff --git a/doc/source/contributor/environments/aufn-ceph.rst b/doc/source/contributor/environments/aufn-ceph.rst
@@ -14,20 +14,18 @@ This environment creates a Universe-from-nothing_-style deployment of Kayobe con
 Prerequisites
 =============
 
-* a baremetal node with at least 64GB of RAM running Rocky Linux 9 or Ubuntu Jammy.
-
-* access to the test pulp server on SMS lab
+* a VM or baremetal node with at least 64GB of RAM running Rocky Linux 9 or Ubuntu Noble.
 
 Setup
 =====
 
 ---
 
-**Note**: The steps detailed below are combined into a convenient script which is packaged with this repo at ``etc/kayobe/environments/aufn-ceph/a-universe-from-nothing.sh``. For an automated deployment, this script can simply be copied to the baremetal host and then executed as ``bash ~/a-universe-from-nothing.sh``.
+**Note**: The steps detailed below are combined into a convenient script which is packaged with this repo at ``etc/kayobe/environments/aufn-ceph/a-universe-from-nothing.sh``. For an automated deployment, this script can simply be copied to the host and then executed as ``bash ~/a-universe-from-nothing.sh``.
 
 ---
 
-To begin the manual setup, access the baremetal node via SSH and install some basic dependencies.
+To begin the manual setup, access the node via SSH and install some basic dependencies.
 
 Rocky:
 
diff --git a/doc/source/contributor/environments/ci-aio.rst b/doc/source/contributor/environments/ci-aio.rst
@@ -18,7 +18,7 @@ make changes to the setup process.
 Prerequisites
 =============
 
-* a Rocky Linux 9 or Ubuntu Jammy 22.04 host
+* a Rocky Linux 9 or Ubuntu Noble 24.04 host
 
 Automated Setup
 ===============
diff --git a/doc/source/contributor/environments/ci-builder.rst b/doc/source/contributor/environments/ci-builder.rst
@@ -29,7 +29,7 @@ cases.
 Prerequisites
 =============
 
-* a Rocky Linux 9 or Ubuntu Jammy 22.04 host
+* a Rocky Linux 9 or Ubuntu Noble 24.04 host
 
 Setup
 =====
diff --git a/doc/source/contributor/environments/ci-multinode.rst b/doc/source/contributor/environments/ci-multinode.rst
@@ -47,19 +47,19 @@ Then, run ``kayobe overcloud service deploy`` to deploy Manila.
 
 To test it, you will need two virtual machines. Cirros does not support the Ceph
 kernel client, so you will need to use a different image. Any regular Linux
-distribution should work. As an example, this guide will use Ubuntu 22.04.
+distribution should work. As an example, this guide will use Ubuntu 24.04.
 
 Download the image locally:
 
 .. code-block:: bash
 
-      wget https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img
+      wget https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img
 
 Upload the image to Glance:
 
 .. code-block:: bash
 
-      openstack image create --container-format bare --disk-format qcow2 --file jammy-server-cloudimg-amd64.img Ubuntu-22.04 --progress
+      openstack image create --container-format bare --disk-format qcow2 --file noble-server-cloudimg-amd64.img Ubuntu-24.04 --progress
 
 Create a keypair:
 
@@ -71,8 +71,8 @@ Create two virtual machines from the image:
 
 .. code-block:: bash
 
-      openstack server create --flavor m1.small --image Ubuntu-22.04 --key-name id_rsa --network admin-tenant ubuntu-client-1
-      openstack server create --flavor m1.small --image Ubuntu-22.04 --key-name id_rsa --network admin-tenant ubuntu-client-2
+      openstack server create --flavor m1.small --image Ubuntu-24.04 --key-name id_rsa --network admin-tenant ubuntu-client-1
+      openstack server create --flavor m1.small --image Ubuntu-24.04 --key-name id_rsa --network admin-tenant ubuntu-client-2
 
 Wait until the instances are active. It is worth noting that this process can
 take a while, especially if the overcloud is deployed to virtual machines. You
diff --git a/doc/source/contributor/testing-ci-automation.rst b/doc/source/contributor/testing-ci-automation.rst
@@ -99,7 +99,7 @@ All in one testing
 The ``.github/workflows/stackhpc-all-in-one.yml`` reusable workflow accepts
 various parameters, and the following are used to create a test matrix for PRs:
 
-  - Operating System (Rocky 9, Ubuntu Jammy)
+  - Operating System (Rocky 9, Ubuntu Noble)
   - Neutron plugin (OVS, OVN)
   - Upgrade or no upgrade
 
diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml
@@ -7,6 +7,9 @@ kolla_image_tags:
   openstack:
     rocky-9: master-rocky-9-20250213T114650
     ubuntu-noble: master-ubuntu-noble-20250213T091307
+  bifrost_deploy:
+    rocky-9: master-rocky-9-20250219T145044
+    ubuntu-noble: master-ubuntu-noble-20250219T145044
   ovn-sb-db-relay:
     rocky-9: master-rocky-9-20250305T111730
     ubuntu-noble: master-ubuntu-noble-20250305T111730
diff --git a/etc/kayobe/pulp-host-image-versions.yml b/etc/kayobe/pulp-host-image-versions.yml
@@ -1,6 +1,5 @@
 ---
 # Overcloud host image versioning tags
 # These images must be in SMS, since they are used by our AIO CI runners
-# TODO: Build real master images
 stackhpc_rocky_9_overcloud_host_image_version: "master-20250213T092714"
 stackhpc_ubuntu_noble_overcloud_host_image_version: "master-20250213T092714"
diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml
@@ -437,7 +437,6 @@ stackhpc_pulp_images_kolla:
   - bifrost-deploy
   - blazar-api
   - blazar-manager
-  - caso
   - cinder-api
   - cinder-backup
   - cinder-scheduler
diff --git a/tools/ubuntu-upgrade-infra-vm.sh b/tools/ubuntu-upgrade-infra-vm.sh
@@ -29,6 +29,6 @@ fi
 
 set -x
 
-kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/ubuntu-upgrade.yml -e os_release=jammy --limit $1
+kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/ubuntu-upgrade.yml -e os_release=noble --limit $1
 
-kayobe infra vm host configure --limit $1 -e os_release=jammy
+kayobe infra vm host configure --limit $1 -e os_release=noble
diff --git a/tools/ubuntu-upgrade-overcloud.sh b/tools/ubuntu-upgrade-overcloud.sh
@@ -29,8 +29,8 @@ fi
 
 set -x
 
-kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/ubuntu-upgrade.yml -e os_release=jammy --limit $1
+kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/ubuntu-upgrade.yml -e os_release=noble --limit $1
 
 kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/ovn-fix-chassis-priorities.yml
 
-kayobe overcloud host configure --limit $1 --kolla-limit $1 -e os_release=jammy
+kayobe overcloud host configure --limit $1 --kolla-limit $1 -e os_release=noble
diff --git a/tools/ubuntu-upgrade-seed-hypervisor.sh b/tools/ubuntu-upgrade-seed-hypervisor.sh
@@ -24,6 +24,6 @@ fi
 
 set -x
 
-kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/ubuntu-upgrade.yml -e os_release=jammy --limit seed-hypervisor
+kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/ubuntu-upgrade.yml -e os_release=noble --limit seed-hypervisor
 
 kayobe seed hypervisor host configure
diff --git a/tools/ubuntu-upgrade-seed.sh b/tools/ubuntu-upgrade-seed.sh
@@ -24,6 +24,6 @@ fi
 
 set -x
 
-kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/ubuntu-upgrade.yml -e os_release=jammy --limit seed
+kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/ubuntu-upgrade.yml -e os_release=noble --limit seed
 
 kayobe seed host configure
