File tree Expand file tree Collapse file tree
environments/ci-aio/inventory/group_vars/controllers Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -191,7 +191,43 @@ jobs:
191191 secrets : inherit
192192 if : ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
193193
194- # Test two upgrade scenarios: Ubuntu Jammy to Noble OVN and Rocky 9 OVN.
194+ all-in-one-rocky-10-ovs :
195+ name : aio (Rocky 10 OVS)
196+ permissions : {}
197+ needs :
198+ - check-changes
199+ - build-kayobe-image
200+ uses : ./.github/workflows/stackhpc-all-in-one.yml
201+ with :
202+ kayobe_image : ${{ needs.build-kayobe-image.outputs.kayobe_image }}
203+ os_distribution : rocky
204+ os_release : " 10"
205+ ssh_username : cloud-user
206+ neutron_plugin : ovs
207+ OS_CLOUD : openstack
208+ if : ${{ needs.check-changes.outputs.aio == 'true' }}
209+ secrets : inherit
210+ if : ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
211+
212+ all-in-one-rocky-10-ovn :
213+ name : aio (Rocky 10 OVN)
214+ permissions : {}
215+ needs :
216+ - check-changes
217+ - build-kayobe-image
218+ uses : ./.github/workflows/stackhpc-all-in-one.yml
219+ with :
220+ kayobe_image : ${{ needs.build-kayobe-image.outputs.kayobe_image }}
221+ os_distribution : rocky
222+ os_release : " 10"
223+ ssh_username : cloud-user
224+ neutron_plugin : ovn
225+ OS_CLOUD : openstack
226+ if : ${{ needs.check-changes.outputs.aio == 'true' }}
227+ secrets : inherit
228+ if : ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
229+
230+ # Test three upgrade scenarios: Ubuntu Jammy to Noble OVN and Rocky 9 OVN.
195231
196232 all-in-one-upgrade-ubuntu-jammy-to-noble-ovn :
197233 name : aio upgrade (Ubuntu Jammy to Noble OVN)
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ ethernet_interface: "{{ ansible_facts['default_ipv4']['interface'] }}"
1010# Controller interface on all-in-one network.
1111aio_interface: breth1
1212# Use dummy1 if it exists, otherwise the bridge will have no ports.
13- aio_bridge_ports: "{{ ['dummy1'] if ( 'dummy1' in hostvars[inventory_hostname].ansible_facts) or ( os_distribution == 'rocky' and os_release == '9') else [] }}"
13+ aio_bridge_ports: "{{ ['dummy1'] if 'dummy1' in hostvars[inventory_hostname].ansible_facts or os_distribution == 'rocky' else [] }}"
1414
1515###############################################################################
1616# Dummy variable to allow Ansible to accept this file.
Original file line number Diff line number Diff line change @@ -12,6 +12,15 @@ kolla_base_distro_version: "{% raw %}{{ kolla_base_distro_version_default_map[ko
1212# Convenience variable for base distro and version string.
1313kolla_base_distro_and_version : " {% raw %}{{ kolla_base_distro }}-{{ kolla_base_distro_version }}{% endraw %}"
1414
15+ # Override the version map used, so we can deploy Rocky 10 container images
16+ # on Rocky 10 hosts.
17+ kolla_base_distro_version_default_map : {
18+ " centos " : " stream9" ,
19+ " debian " : " bookworm" ,
20+ " rocky " : " {{ os_release }}" ,
21+ " ubuntu " : " noble" ,
22+ }
23+
1524# Dict of Kolla image tags to deploy for each service.
1625# Each key is the tag variable prefix name, and the value is another dict,
1726# where the key is the OS distro and the value is the tag to deploy.
You can’t perform that action at this time.
0 commit comments