Merge branch 'stackhpc/2025.1' into epoxy-aufn

Author: Alex-Welsh

.github/workflows/stackhpc-pull-request.yml

@@ -219,21 +219,20 @@ jobs:
     secrets: inherit
     if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
 
-  # FIXME: Disabled until https://bugs.launchpad.net/neutron/+bug/2112492 gets resolved
-  # all-in-one-upgrade-rocky-9-ovs:
-  #   name: aio upgrade (Rocky 9 OVS)
-  #   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: ovs
-  #     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-ovs:
+    name: aio upgrade (Rocky 9 OVS)
+    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: ovs
+      OS_CLOUD: openstack
+      if: ${{ needs.check-changes.outputs.aio == 'true' }}
+      upgrade: true
+    secrets: inherit
+    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}

etc/kayobe/kolla-image-tags.yml

@@ -9,3 +9,6 @@ kolla_image_tags:
   bifrost:
     rocky-9: 2025.1-rocky-9-20250626T152358
     ubuntu-noble: 2025.1-ubuntu-noble-20250626T152358
+  neutron_metadata_agent:
+    rocky-9: 2025.1-rocky-9-20250626T074649
+    ubuntu-noble: 2025.1-ubuntu-noble-20250626T074649

etc/kayobe/stackhpc.yml

@@ -178,4 +178,4 @@ stackhpc_enable_kolla_ansible_check: true
 download_amphora_from_ark: true
 
 # Octavia Amphora image version
-stackhpc_amphora_image_version: "TODO"
+stackhpc_amphora_image_version: "2025.1-20250619T113933"