From 97e883b845ce298d0eb223b6e8de1f1262307ec5 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Thu, 29 May 2025 15:48:39 +0100 Subject: [PATCH 1/2] Remove undefined swift variables Kolla ansible dropped Swift support since [1]. The variable ``enable_swift`` will not be generated from ``kolla_enable_swift``. [1] https://review.opendev.org/c/openstack/kolla-ansible/+/945113 --- etc/kayobe/kolla.yml | 3 --- .../kolla/inventory/group_vars/prometheus-blackbox-exporter | 2 -- 2 files changed, 5 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 1a9386d5c..4e92495b8 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -738,9 +738,6 @@ kolla_enable_prometheus: true #kolla_enable_rabbitmq: #kolla_enable_redis: #kolla_enable_skyline: -#kolla_enable_swift: -#kolla_enable_swift_recon: -#kolla_enable_swift_s3api: #kolla_enable_tacker: #kolla_enable_telegraf: #kolla_enable_trove: diff --git a/etc/kayobe/kolla/inventory/group_vars/prometheus-blackbox-exporter b/etc/kayobe/kolla/inventory/group_vars/prometheus-blackbox-exporter index 1da9491b4..feea1b993 100644 --- a/etc/kayobe/kolla/inventory/group_vars/prometheus-blackbox-exporter +++ b/etc/kayobe/kolla/inventory/group_vars/prometheus-blackbox-exporter @@ -62,5 +62,3 @@ stackhpc_prometheus_blackbox_exporter_endpoints_default: enabled: "{{ enable_ironic | bool }}" - endpoints: "{% set ironic_inspector_endpoints = [] %}{% for host in groups.get('ironic-inspector', []) %}{{ ironic_inspector_endpoints.append('ironic_inspector_backend_' + host.replace('-', '') + ':os_endpoint:' + 'http://' + ('api' | kolla_address(host) | put_address_in_context('url')) + ':' + hostvars[host]['ironic_inspector_port']) }}{% endfor %}{{ ironic_inspector_endpoints }}" enabled: "{{ enable_ironic | bool }}" - - endpoints: "{% set swift_endpoints = [] %}{% for host in groups.get('swift-api', []) %}{{ swift_endpoints.append('swift_backend_' + host.replace('-', '') + ':os_endpoint:' + 'http://' + ('api' | kolla_address(host) | put_address_in_context('url')) + ':' + hostvars[host]['swift_api_port']) }}{% endfor %}{{ swift_endpoints }}" - enabled: "{{ enable_swift | bool }}" From b5a0085310a4df5512ffc8d62085aa2faedafdc0 Mon Sep 17 00:00:00 2001 From: Alex-Welsh Date: Fri, 6 Jun 2025 14:56:06 +0100 Subject: [PATCH 2/2] Add initial Epoxy container image tags CI: re-enable aios --- .github/workflows/stackhpc-pull-request.yml | 206 ++++++++++---------- etc/kayobe/kolla-image-tags.yml | 21 +- 2 files changed, 107 insertions(+), 120 deletions(-) diff --git a/.github/workflows/stackhpc-pull-request.yml b/.github/workflows/stackhpc-pull-request.yml index 056ba3a28..264246551 100644 --- a/.github/workflows/stackhpc-pull-request.yml +++ b/.github/workflows/stackhpc-pull-request.yml @@ -20,7 +20,7 @@ jobs: if: github.repository == 'stackhpc/stackhpc-kayobe-config' needs: - lint - - tox + # - tox outputs: aio: ${{ steps.changes.outputs.aio }} build-kayobe-image: ${{ steps.changes.outputs.build-kayobe-image }} @@ -118,20 +118,74 @@ 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-ovn: - # name: aio (Ubuntu Noble OVN) + all-in-one-ubuntu-noble-ovn: + name: aio (Ubuntu Noble 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: ubuntu + os_release: noble + ssh_username: ubuntu + neutron_plugin: ovn + OS_CLOUD: openstack + if: ${{ needs.check-changes.outputs.aio == 'true' }} + secrets: inherit + if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }} + + all-in-one-rocky-9-ovs: + name: aio (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' }} + secrets: inherit + if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }} + + all-in-one-rocky-9-ovn: + name: aio (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' }} + secrets: inherit + if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }} + + # 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: # - check-changes # - build-kayobe-image @@ -141,99 +195,45 @@ jobs: # os_distribution: ubuntu # os_release: noble # ssh_username: ubuntu - # neutron_plugin: ovn - # OS_CLOUD: openstack - # if: ${{ needs.check-changes.outputs.aio == 'true' }} - # secrets: inherit - # if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }} - - # all-in-one-rocky-9-ovs: - # name: aio (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' }} - # secrets: inherit - # if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }} - - # all-in-one-rocky-9-ovn: - # name: aio (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' }} - # secrets: inherit - # if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }} - - # # 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: - # # - 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: ubuntu - # # os_release: noble - # # ssh_username: ubuntu - # # 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-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-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-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-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' }} diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index e33204c6e..75ec0cdda 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -5,20 +5,7 @@ # TODO: Rebuild epoxy images 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 - prometheus: - rocky-9: master-rocky-9-20250430T112026 - ubuntu-noble: master-ubuntu-noble-20250430T112026 - rabbitmq: - rocky-9: master-rocky-9-20250502T080944 - ubuntu-noble: master-ubuntu-noble-20250502T080944 - skyline: - rocky-9: master-rocky-9-20250425T091159 - ubuntu-noble: master-ubuntu-noble-20250425T091159 + rocky-9: 2025.1-rocky-9-20250603T110500 + ubuntu-noble: 2025.1-ubuntu-noble-20250606T113506 + neutron_l3_agent: + rocky-9: 2025.1-rocky-9-20250606T090153