From 94b78b37ab18dccd55457e0efe6a9d82a99e1931 Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Fri, 29 Nov 2024 18:21:34 +0000 Subject: [PATCH 01/24] Update .gitreview for stable/2024.2 Change-Id: I32de45e8436e0b64cf3b99c5bad088c3ed227732 --- .gitreview | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitreview b/.gitreview index 8739a7c488..35cc6527f5 100644 --- a/.gitreview +++ b/.gitreview @@ -2,4 +2,4 @@ host=review.opendev.org port=29418 project=openstack/openstack-ansible.git - +defaultbranch=stable/2024.2 From 37aadd383a8c078ba6e9ecf7a4eb17fc2dc212be Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Fri, 29 Nov 2024 18:21:38 +0000 Subject: [PATCH 02/24] Update TOX_CONSTRAINTS_FILE for stable/2024.2 Update the URL to the upper-constraints file to point to the redirect rule on releases.openstack.org so that anyone working on this branch will switch to the correct upper-constraints list automatically when the requirements repository branches. Until the requirements repository has as stable/2024.2 branch, tests will continue to use the upper-constraints list on master. Change-Id: I67a8a317526a183b69071743875769df0a0f6079 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 520fa8a77c..48403d5c0b 100644 --- a/tox.ini +++ b/tox.ini @@ -8,7 +8,7 @@ ignore_basepython_conflict = True usedevelop = True basepython = python3 install_command = - pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages} + pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.2} {opts} {packages} deps = -r{toxinidir}/global-requirement-pins.txt -r{toxinidir}/test-requirements.txt From d51c8dbedfba20f966c2563ca191f7369b277436 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Mon, 2 Dec 2024 10:10:31 +0100 Subject: [PATCH 03/24] Switch plugins repo to 2024.2 branch For 2024.2 release we need to track the 2024.2 branch for our collection Change-Id: Ia14cfff9701c21c1dc89b26f8650794555baef83 --- ansible-collection-requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible-collection-requirements.yml b/ansible-collection-requirements.yml index 5b51e3eb3c..e4870fd337 100644 --- a/ansible-collection-requirements.yml +++ b/ansible-collection-requirements.yml @@ -11,7 +11,7 @@ collections: - name: openstack.osa source: https://opendev.org/openstack/openstack-ansible-plugins type: git - version: master + version: 63ece84a9f85438f44ffd3fa044b45681d1b7d8c - name: community.general source: https://github.com/ansible-collections/community.general type: git From 7c3639cf0f6aa6e86c890e38033db279d91689b4 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Mon, 2 Dec 2024 16:33:51 +0100 Subject: [PATCH 04/24] [doc] Doc index page to contain only release-specific data Change-Id: I6c70216b54134569c34300d3abe91e69eba4244c --- doc/source/index.rst | 222 ++----------------------------------------- 1 file changed, 6 insertions(+), 216 deletions(-) diff --git a/doc/source/index.rst b/doc/source/index.rst index 79144b480c..d63ce16440 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -7,229 +7,19 @@ Abstract OpenStack-Ansible provides Ansible playbooks and roles for the deployment and configuration of an OpenStack environment. -Documentation for each of the following releases is available. - -2024.2 (Dalmatian): Under development -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +2024.2 (Dalmatian): Maintained +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -OpenStack-Ansible 2024.2 (Dalmatian) is currently Under Development. +OpenStack-Ansible 2024.2 (Dalmatian) was first released with the 30.0.0 tag on +December 2, 2024. .. toctree:: :maxdepth: 1 - Deployment guide - Release notes + Deployment guide + Release notes admin/index user/index contributor/contributing contributor/index reference/index - -2024.1 (Caracal): Maintained -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -OpenStack-Ansible 2024.1 (Bobcat) was first released with the 29.0.0 tag on -June 6, 2024. - -* `OpenStack-Ansible 2024.1 Documentation`_ - -* `OpenStack-Ansible 2024.1 series release notes`_ - -.. _OpenStack-Ansible 2024.1 Documentation: https://docs.openstack.org/openstack-ansible/2024.1/ -.. _OpenStack-Ansible 2024.1 series release notes: https://docs.openstack.org/releasenotes/openstack-ansible/2024.1.html - - -2023.2 (Bobcat): Maintained -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -OpenStack-Ansible 2023.2 (Bobcat) was first released with the 28.0.0 tag on -December 7, 2023. - -* `OpenStack-Ansible 2023.2 Documentation`_ - -* `OpenStack-Ansible 2023.2 series release notes`_ - -.. _OpenStack-Ansible 2023.2 Documentation: https://docs.openstack.org/openstack-ansible/2023.2/ -.. _OpenStack-Ansible 2023.2 series release notes: https://docs.openstack.org/releasenotes/openstack-ansible/2023.2.html - - -2023.1 (Antelope): Maintained -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -OpenStack-Ansible 2023.1 (Antelope) was first released with the 27.0.0 tag on -June 1, 2023. - -* `OpenStack-Ansible 2023.1 Documentation`_ - -* `OpenStack-Ansible 2023.1 series release notes`_ - -.. _OpenStack-Ansible 2023.1 Documentation: https://docs.openstack.org/openstack-ansible/2023.1/ -.. _OpenStack-Ansible 2023.1 series release notes: https://docs.openstack.org/releasenotes/openstack-ansible/2023.1.html - -Zed: EOM (end-of-maintenance) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -OpenStack-Ansible Zed series was EOM-ed on June 6, 2024 - -* `OpenStack-Ansible Zed Documentation`_ - -* `OpenStack-Ansible Zed series release notes`_ - -.. _OpenStack-Ansible Zed Documentation: https://docs.openstack.org/openstack-ansible/zed/ -.. _OpenStack-Ansible Zed series release notes: https://docs.openstack.org/releasenotes/openstack-ansible/zed.html - -Yoga: EOM (end-of-maintenance) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -OpenStack-Ansible Yoga series was EOM-ed on February 8, 2024. - -* `OpenStack-Ansible Yoga Documentation`_ - -* `OpenStack-Ansible Yoga series release notes`_ - -.. _OpenStack-Ansible Yoga Documentation: https://docs.openstack.org/openstack-ansible/yoga/ -.. _OpenStack-Ansible Yoga series release notes: https://docs.openstack.org/releasenotes/openstack-ansible/yoga.html - - -Xena: EOM (end-of-maintenance) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -OpenStack-Ansible Xena series was EOM-ed on April 12, 2024. - -* `OpenStack-Ansible Xena Documentation`_ - -* `OpenStack-Ansible Xena series release notes`_ - -.. _OpenStack-Ansible Xena Documentation: https://docs.openstack.org/openstack-ansible/xena/ -.. _OpenStack-Ansible Xena series release notes: https://docs.openstack.org/releasenotes/openstack-ansible/xena.html - - -Wallaby: EOM (end-of-maintenance) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -OpenStack-Ansible Wallaby series was EOM-ed on April 12, 2024. - -* `OpenStack-Ansible Wallaby Documentation`_ - -* `OpenStack-Ansible Wallaby series release notes`_ - -.. _OpenStack-Ansible Wallaby Documentation: https://docs.openstack.org/openstack-ansible/wallaby/ -.. _OpenStack-Ansible Wallaby series release notes: https://docs.openstack.org/releasenotes/openstack-ansible/wallaby.html - - -Victoria: EOM (end-of-maintenance) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -OpenStack-Ansible Victoria series was EOM-ed on April 12, 2024. - -* `OpenStack-Ansible Victoria Documentation`_ - -* `OpenStack-Ansible Victoria series release notes`_ - -.. _OpenStack-Ansible Victoria Documentation: https://docs.openstack.org/openstack-ansible/victoria/ -.. _OpenStack-Ansible Victoria series release notes: https://docs.openstack.org/releasenotes/openstack-ansible/victoria.html - - -Ussuri: EOL (end-of-life) -~~~~~~~~~~~~~~~~~~~~~~~~~ - -OpenStack-Ansible Ussuri series was EOL'd on 3 January 2024. - -* `OpenStack-Ansible Ussuri Documentation`_ - -* `OpenStack-Ansible Ussuri series release notes`_ - -.. _OpenStack-Ansible Ussuri Documentation: https://docs.openstack.org/openstack-ansible/ussuri/ -.. _OpenStack-Ansible Ussuri series release notes: https://docs.openstack.org/releasenotes/openstack-ansible/ussuri.html - - -Train: EOL (end-of-life) -~~~~~~~~~~~~~~~~~~~~~~~~ - -OpenStack-Ansible Train series was EOL'd on 3 January 2024. - -* `OpenStack-Ansible Train Documentation`_ - -* `OpenStack-Ansible Train series release notes`_ - -.. _OpenStack-Ansible Train Documentation: https://docs.openstack.org/openstack-ansible/train/ -.. _OpenStack-Ansible Train series release notes: https://docs.openstack.org/releasenotes/openstack-ansible/train.html - -Stein: EOL (end-of-life) -~~~~~~~~~~~~~~~~~~~~~~~~ - -OpenStack-Ansible's Stein series was EOL'd on 14 December 2023. - -* `OpenStack-Ansible Stein Documentation`_ - -* `OpenStack-Ansible Stein series release notes`_ - -.. _OpenStack-Ansible Stein Documentation: https://docs.openstack.org/openstack-ansible/stein/ -.. _OpenStack-Ansible Stein series release notes: https://docs.openstack.org/releasenotes/openstack-ansible/stein.html - - -Rocky: EOL (end-of-life) -~~~~~~~~~~~~~~~~~~~~~~~~ - -OpenStack-Ansible's Rocky series was EOL'd on 11 July 2023. - -* `OpenStack-Ansible Rocky Documentation`_ - -* `OpenStack-Ansible Rocky series release notes`_ - -.. _OpenStack-Ansible Rocky Documentation: https://docs.openstack.org/openstack-ansible/rocky/ -.. _OpenStack-Ansible Rocky series release notes: https://docs.openstack.org/releasenotes/openstack-ansible/rocky.html - -Queens: EOL (end-of-life) -~~~~~~~~~~~~~~~~~~~~~~~~~ -OpenStack-Ansible's Queens series was EOL'd on 19 October 2022. - -* `OpenStack-Ansible Queens Documentation`_ - -* `OpenStack-Ansible Queens series release notes`_ - -.. _OpenStack-Ansible Queens Documentation: https://docs.openstack.org/openstack-ansible/queens/ -.. _OpenStack-Ansible Queens series release notes: https://docs.openstack.org/releasenotes/openstack-ansible/queens.html - -Pike: EOL (end-of-life) -~~~~~~~~~~~~~~~~~~~~~~~ - -OpenStack-Ansible's Pike series was EOL'd on 17 June 2022. - -* `OpenStack-Ansible Pike Documentation`_ - -* `OpenStack-Ansible Pike series release notes`_ - -.. _OpenStack-Ansible Pike Documentation: https://docs.openstack.org/openstack-ansible/pike/ -.. _OpenStack-Ansible Pike series release notes: https://docs.openstack.org/releasenotes/openstack-ansible/pike.html - -Ocata: EOL (end-of-life) -~~~~~~~~~~~~~~~~~~~~~~~~ - -OpenStack-Ansible's Ocata series was EOL'd on 21 December 2022. - -* `OpenStack-Ansible Ocata Documentation`_ - -* `OpenStack-Ansible Ocata series release notes`_ - -.. _OpenStack-Ansible Ocata Documentation: https://docs.openstack.org/openstack-ansible/ocata/ -.. _OpenStack-Ansible Ocata series release notes: https://docs.openstack.org/releasenotes/openstack-ansible/ocata.html - -Newton: EOL (end-of-life) -~~~~~~~~~~~~~~~~~~~~~~~~~~ - -OpenStack-Ansible's Newton series was EOL'd on 3 April 2018. - -To view the documentation only, -see the `OpenStack-Ansible Newton Documentation `_. - -.. _OpenStack-Ansible Newton series timeline: https://launchpad.net/openstack-ansible/newton -.. _OpenStack-Ansible Newton series release notes: https://docs.openstack.org/releasenotes/openstack-ansible/newton.html - -Mitaka: EOL (end-of-life) -~~~~~~~~~~~~~~~~~~~~~~~~~~ - -OpenStack-Ansible's Mitaka series was EOL'd on 10 April 2017. - -To view the documentation only, -see the `OpenStack-Ansible Mitaka Documentation `_. From c0b7bfe667fbb753f8a039b92286b3e18d4a3b54 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Fri, 10 Jan 2025 17:17:21 +0100 Subject: [PATCH 05/24] Bump SHAs for 2024.2 Change-Id: I91521c2b39ad576566cde476ab92f6f7d6efb4e9 --- ansible-role-requirements.yml | 24 +++++++++---------- .../group_vars/cinder_all/source_git.yml | 4 ++-- .../group_vars/horizon_all/source_git.yml | 4 ++-- .../group_vars/ironic_all/source_git.yml | 4 ++-- .../group_vars/magnum_all/source_git.yml | 4 ++-- .../group_vars/manila_all/source_git.yml | 4 ++-- .../group_vars/neutron_all/source_git.yml | 10 ++++---- inventory/group_vars/nova_all/source_git.yml | 4 ++-- inventory/group_vars/swift_all/source_git.yml | 4 ++-- inventory/group_vars/trove_all/source_git.yml | 4 ++-- 10 files changed, 33 insertions(+), 33 deletions(-) diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index 41d1206739..afb24e6b3d 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -38,9 +38,9 @@ - name: systemd_networkd src: https://opendev.org/openstack/ansible-role-systemd_networkd scm: git - version: 2f562be134f295a5b8a4787cf6aa1a874b348185 + version: 70555898e8a6c8463cfea8d3f06b9aea861f1583 trackbranch: stable/2024.2 - shallow_since: '2024-11-27' + shallow_since: '2025-01-07' - name: systemd_service src: https://opendev.org/openstack/ansible-role-systemd_service scm: git @@ -86,9 +86,9 @@ - name: lxc_container_create scm: git src: https://opendev.org/openstack/openstack-ansible-lxc_container_create - version: 48d8aa72f561edb096b6a08184335d12a1264151 + version: cd4577303d9117641175b90378d64156cd535f55 trackbranch: stable/2024.2 - shallow_since: '2024-11-27' + shallow_since: '2025-01-07' - name: lxc_hosts scm: git src: https://opendev.org/openstack/openstack-ansible-lxc_hosts @@ -224,9 +224,9 @@ - name: os_neutron scm: git src: https://opendev.org/openstack/openstack-ansible-os_neutron - version: 83b30f0c883c34fb00fa8c591e826d2146d35502 + version: cbbc303248515c5fea8b2276d390222490179856 trackbranch: stable/2024.2 - shallow_since: '2024-11-27' + shallow_since: '2024-12-05' - name: os_nova scm: git src: https://opendev.org/openstack/openstack-ansible-os_nova @@ -254,9 +254,9 @@ - name: os_skyline scm: git src: https://opendev.org/openstack/openstack-ansible-os_skyline - version: 410dab5168797be342dbcc44d0a7778cc7d97e25 + version: 6298ff06e71b6dd34a0c921183fcc4e1a4dc3b35 trackbranch: stable/2024.2 - shallow_since: '2024-11-27' + shallow_since: '2025-01-05' - name: os_swift scm: git src: https://opendev.org/openstack/openstack-ansible-os_swift @@ -290,15 +290,15 @@ - name: rabbitmq_server scm: git src: https://opendev.org/openstack/openstack-ansible-rabbitmq_server - version: 1afc2a503be837afacf30f8171bf7af90c6cfbd7 + version: 1677a5e19bf11985db13145820c771ceb8d6b609 trackbranch: stable/2024.2 - shallow_since: '2024-11-27' + shallow_since: '2024-12-24' - name: repo_server scm: git src: https://opendev.org/openstack/openstack-ansible-repo_server - version: c314d4299807cc20fc1c593e227d5b028b763ae2 + version: 4606ca00eb31f65c43ec49d592a5ac70356e7721 trackbranch: stable/2024.2 - shallow_since: '2024-11-27' + shallow_since: '2025-01-07' # External dependencies - name: etcd scm: git diff --git a/inventory/group_vars/cinder_all/source_git.yml b/inventory/group_vars/cinder_all/source_git.yml index aa23b1f8ab..1adfebb930 100644 --- a/inventory/group_vars/cinder_all/source_git.yml +++ b/inventory/group_vars/cinder_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.11.2024 ### +### HEAD as of 10.01.2025 ### ## Cinder service cinder_git_repo: "{{ openstack_opendev_base_url }}/openstack/cinder" -cinder_git_install_branch: 9dbf2967bee1060ae7419897942dfe554432a742 +cinder_git_install_branch: 3a19137102d420bbbbc45ebdd9c9d7fc47427cfd cinder_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/horizon_all/source_git.yml b/inventory/group_vars/horizon_all/source_git.yml index dca76b45b0..09a8757a15 100644 --- a/inventory/group_vars/horizon_all/source_git.yml +++ b/inventory/group_vars/horizon_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.11.2024 ### +### HEAD as of 10.01.2025 ### ## Horizon service horizon_git_repo: "{{ openstack_opendev_base_url }}/openstack/horizon" -horizon_git_install_branch: e70198f486afc59621780c2de4d48c990300cb31 +horizon_git_install_branch: 4bcc3dceaca8041477615a9ba54922356670a424 horizon_git_track_branch: stable/2024.2 ## Adjutant dashboard plugin diff --git a/inventory/group_vars/ironic_all/source_git.yml b/inventory/group_vars/ironic_all/source_git.yml index b17e6ed3c3..f731d0b84a 100644 --- a/inventory/group_vars/ironic_all/source_git.yml +++ b/inventory/group_vars/ironic_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.11.2024 ### +### HEAD as of 10.01.2025 ### ## Ironic service ironic_git_repo: "{{ openstack_opendev_base_url }}/openstack/ironic" -ironic_git_install_branch: 17914538dfd1657cd9ba7e44ea84d9a5c8a1ae1a +ironic_git_install_branch: d1872d7fcff646d8bdda876ba85bdff6f67f91cd ironic_git_track_branch: stable/2024.2 ## Ironic inspector service diff --git a/inventory/group_vars/magnum_all/source_git.yml b/inventory/group_vars/magnum_all/source_git.yml index 07529da2ee..50fb728fd9 100644 --- a/inventory/group_vars/magnum_all/source_git.yml +++ b/inventory/group_vars/magnum_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 28.11.2024 ### +### HEAD as of 10.01.2025 ### ## Magnum service magnum_git_repo: "{{ openstack_opendev_base_url }}/openstack/magnum" -magnum_git_install_branch: 71729a8d716ef7cd6a869408e35d60e96bc125d8 +magnum_git_install_branch: db197e08a09da93062fc4222180051dadfc0f0d8 magnum_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/manila_all/source_git.yml b/inventory/group_vars/manila_all/source_git.yml index 10ea378bc1..ca3cf4a472 100644 --- a/inventory/group_vars/manila_all/source_git.yml +++ b/inventory/group_vars/manila_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.11.2024 ### +### HEAD as of 10.01.2025 ### ## Manila service manila_git_repo: "{{ openstack_opendev_base_url }}/openstack/manila" -manila_git_install_branch: 052e324e26b6ebdc4b8e011df9f41b43f1cea09b +manila_git_install_branch: 60aa36b8f8e71748ee0e492269ad97c13ca29821 manila_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/neutron_all/source_git.yml b/inventory/group_vars/neutron_all/source_git.yml index cd43db8972..c955bafc71 100644 --- a/inventory/group_vars/neutron_all/source_git.yml +++ b/inventory/group_vars/neutron_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 28.11.2024 ### +### HEAD as of 10.01.2025 ### ## Neutron service neutron_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron" -neutron_git_install_branch: 5cdeab2bd48129375bef845aac3d8c59f24d3e0e +neutron_git_install_branch: 13938b047358d277623bf9e6cbf2c4dcd5a4c077 neutron_git_track_branch: stable/2024.2 neutron_vpnaas_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-vpnaas" @@ -25,7 +25,7 @@ neutron_vpnaas_git_install_branch: 990e478b1e6db459b6cb9aec53ce808e2957bb65 neutron_vpnaas_git_track_branch: stable/2024.2 neutron_fwaas_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-fwaas" -neutron_fwaas_git_install_branch: 7d40be7362ceafe39774e9dcd388863dff153d2e +neutron_fwaas_git_install_branch: 36db6ddb6a2369377bcf82b37067319304d075fd neutron_fwaas_git_track_branch: stable/2024.2 neutron_dynamic_routing_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-dynamic-routing" @@ -49,7 +49,7 @@ networking_nsx_git_install_branch: 715cb5fc1174b9226f043e49ffd389add44f070a networking_nsx_git_track_branch: master networking_nsxlib_git_repo: "{{ openstack_opendev_base_url }}/x/vmware-nsxlib" -networking_nsxlib_git_install_branch: c8a80f7e6f74f4c87311d4e58f5e122f209dd308 +networking_nsxlib_git_install_branch: 62a07420a032554811c24c984ea370ecf0f6d3f1 networking_nsxlib_git_track_branch: master networking_baremetal_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-baremetal" @@ -57,5 +57,5 @@ networking_baremetal_git_install_branch: 1fba63ce21619d3fe70117c6679e53629c612bc networking_baremetal_git_track_branch: stable/2024.2 networking_ovn_bgp_git_repo: "{{ openstack_opendev_base_url }}/openstack/ovn-bgp-agent" -networking_ovn_bgp_git_install_branch: 02b7a8efb0189b857746f9f50cb5983df49b893d +networking_ovn_bgp_git_install_branch: 08fb541e696e9cf5df1bcde0a0b3a9765d24a21c networking_ovn_bgp_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/nova_all/source_git.yml b/inventory/group_vars/nova_all/source_git.yml index 051e9e1377..ec249707cc 100644 --- a/inventory/group_vars/nova_all/source_git.yml +++ b/inventory/group_vars/nova_all/source_git.yml @@ -23,11 +23,11 @@ ## * All items with this file should be separated by `name_` note that the name of the ## package should be one long name with no additional `_` separating it. -### HEAD as of 28.11.2024 ### +### HEAD as of 10.01.2025 ### ## NOVNC from source novncproxy_git_repo: "{{ openstack_github_base_url }}/novnc/noVNC" -novncproxy_git_install_branch: 52ddb20d2597c4d6c72cedce447c6fe9998308d4 +novncproxy_git_install_branch: 3193f808b5366392de94c1a9b144fc6845daeabb novncproxy_git_track_branch: master ## spice-html5 from source diff --git a/inventory/group_vars/swift_all/source_git.yml b/inventory/group_vars/swift_all/source_git.yml index a33964e396..d9f02ccb5f 100644 --- a/inventory/group_vars/swift_all/source_git.yml +++ b/inventory/group_vars/swift_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 30.09.2024 ### +### HEAD as of 10.01.2025 ### ## Swift service swift_git_repo: "{{ openstack_opendev_base_url }}/openstack/swift" -swift_git_install_branch: 27503ac2df5cb77b5fdf29196e555178ddbfdef7 +swift_git_install_branch: 1534385bcc10de4aaa7aa2762bf9e7961bb2ef17 swift_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/trove_all/source_git.yml b/inventory/group_vars/trove_all/source_git.yml index 35d7e48199..d26fe9c80c 100644 --- a/inventory/group_vars/trove_all/source_git.yml +++ b/inventory/group_vars/trove_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 28.11.2024 ### +### HEAD as of 10.01.2025 ### ## Trove service trove_git_repo: "{{ openstack_opendev_base_url }}/openstack/trove" -trove_git_install_branch: 4c191c30322a6fac2acfe6743daf151630bf8480 +trove_git_install_branch: 95e879d42544cec28322a21bd10fa0537f88e5de trove_git_track_branch: stable/2024.2 From 311767812ba251606c099062c71d82cb33767eda Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Mon, 13 Jan 2025 15:30:56 +0000 Subject: [PATCH 06/24] Fix inventory adjustment for legacy container naming Patch [1] adjusted the default container names to contain dashes rather than underscores. Inventories created prior to this patch will still have container names with underscores, and these are not handled correctly when making adjustments to env.d as the "type_and_name" variable in the inventory generator will always contain dashes in recent releases. This results in the legacy container name never matching the new type_and_name, so components added to, or moved between host groups in env.d will never be assigned to those hosts. [1] https://github.com/openstack/openstack-ansible/commit/d74d03803242ae1fb0137db4cf95def5b50474ca Change-Id: I20967f1b6e26977a64ec338780cc85006bc1f846 (cherry picked from commit 1590e39e195d4e0f79f8de7ac9061f2242ec9208) --- osa_toolkit/generate.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/osa_toolkit/generate.py b/osa_toolkit/generate.py index 117d14e6de..cfa89c556f 100755 --- a/osa_toolkit/generate.py +++ b/osa_toolkit/generate.py @@ -290,13 +290,14 @@ def _append_to_host_groups(inventory, container_type, assignment, host_type, container = hdata['container_name'] = hname else: container = hdata['container_name'] + container_name = re.sub(r'_', '-', f'{container}') component = hdata.get('component') if container.startswith(host_type): if 'physical_host' not in hdata: hdata['physical_host'] = host_type - if container.startswith('{}-'.format(type_and_name)): + if container_name.startswith('{}-'.format(type_and_name)): appended = du.append_if(array=iah, item=container) if appended: logger.debug("Added host %s to %s hosts", @@ -307,7 +308,7 @@ def _append_to_host_groups(inventory, container_type, assignment, host_type, if appended: logger.debug("Added is_metal host %s to %s hosts", container, assignment) - if container.startswith('{}-'.format(type_and_name)): + if container_name.startswith('{}-'.format(type_and_name)): appended = du.append_if(array=iph, item=container) if appended: logger.debug("Added host %s to %s hosts", From b2266975b881af307107d75d77cb4273b94df490 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Tue, 24 Dec 2024 09:35:14 +0100 Subject: [PATCH 07/24] Update test-requirements Let's try using more modern versions of ansible-lint and flake8 With that it fixes execution of linters jobs, as noble was not adjusted in project-template which resulted if linters being skipped. Change-Id: I28c44c4bb858eb7fd125b648b6cb506bd5939ce7 (cherry picked from commit fcef934d3ab9683b1a8612e97cf05868a812a1a1) --- test-requirements.txt | 9 +++------ zuul.d/project-templates.yaml | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index 88615ad250..a31031b2b8 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,14 +3,11 @@ # process, which may cause wedges in the gate later. # Keep hacking first, it pulls in the right versions of flake8, mccabe and pyflakes -hacking>=3.2.0,<4.0 # Apache-2.0 +hacking>=3.2.0,<=7.0.0 # Apache-2.0 bashate>=0.5.1 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 virtualenv>=14.0.6 # MIT -# TODO(noonedeadpunk) Upgrade linters versions and drop pycodestyle -# once we stop doing linters check for the integrated repo with -# openstack-ansible-tests/test-ansible-lint.sh -flake8==3.8.3 # MIT -ansible-lint==6.19.0 # MIT +flake8 # MIT +ansible-lint==24.12.2 # MIT netaddr>=0.7.18 # BSD Jinja2>=2.10 # BSD diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml index 94f3b37221..852fcd6149 100644 --- a/zuul.d/project-templates.yaml +++ b/zuul.d/project-templates.yaml @@ -284,10 +284,10 @@ name: openstack-ansible-linters-jobs check: jobs: - - openstack-ansible-linters-ubuntu-jammy + - openstack-ansible-linters-ubuntu-noble gate: jobs: - - openstack-ansible-linters-ubuntu-jammy + - openstack-ansible-linters-ubuntu-noble - project-template: name: openstack-ansible-lxc-backingstore-jobs From 390183a3936323e1d0ff10934c5c3f98557e6ef8 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Wed, 15 Jan 2025 15:15:09 +0000 Subject: [PATCH 08/24] Use the same version of ansible for linters as is used for deployments. If this is uncontrolled the version can move forward and break CI jobs due to different behaviour between the lint and deploy versions of ansible-core. Change-Id: I1133869dd24e3282ff18f30a6069edf35e46175f --- test-requirements.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test-requirements.txt b/test-requirements.txt index a31031b2b8..3e6b72babb 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -11,3 +11,7 @@ flake8 # MIT ansible-lint==24.12.2 # MIT netaddr>=0.7.18 # BSD Jinja2>=2.10 # BSD + +# NOTE(jrosser) Ensure that we are using the same version of ansible +# for test cases such as linters, as we do for deployments +ansible-core==2.17.5 From 55bacc3eafa6864a455a3e44115d1d505c4522e2 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Tue, 21 Jan 2025 15:16:50 +0000 Subject: [PATCH 09/24] Remove ansible-role-qdrouterd from zuul required-projects This repository is to be retired and leaving it here will break the CI config and result in many jobs failing to run. See https://review.opendev.org/c/openstack/governance/+/938193 Change-Id: I30e54da3b3ba1af32a063f0b1e5d105e4936fa30 --- zuul.d/jobs.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 5c530d4873..7b13d6ec3f 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -90,7 +90,6 @@ - name: openstack/openstack-ansible-os_tempest - name: openstack/openstack-ansible-os_trove - name: openstack/openstack-ansible-plugins - - name: openstack/ansible-role-qdrouterd - name: openstack/openstack-ansible-rabbitmq_server - name: openstack/openstack-ansible-repo_server - name: openstack/ansible-role-systemd_service From d492b9ffda4ddc5aa0d58f97f8049e4ae7f849e4 Mon Sep 17 00:00:00 2001 From: Andrew Bonney Date: Tue, 4 Feb 2025 12:37:02 +0000 Subject: [PATCH 10/24] docs: adjust rabbitmq quorum queue guidance for 2024.2 onwards Change-Id: Idcacbd259a704a09512c2008e47f73a268f52799 (cherry picked from commit 963b822c4b03a2b23b96f7f2c58db88302ad1ce4) --- doc/source/admin/upgrades/major-upgrades.rst | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/doc/source/admin/upgrades/major-upgrades.rst b/doc/source/admin/upgrades/major-upgrades.rst index 0217cb1c4e..8e536c4826 100644 --- a/doc/source/admin/upgrades/major-upgrades.rst +++ b/doc/source/admin/upgrades/major-upgrades.rst @@ -157,13 +157,11 @@ Please review the contents of the playbook for more information. .. note:: - With upgrade to 2024.1 (Caracal) release usage of RabbitMQ Quorum Queues - is enabled by default. Migration to usage of Quorum Queues results - in prolonged downtime for services during upgrade. - - To reduce downtime you might want to set - ``oslomsg_rabbit_quorum_queues: false`` at this point and migrate to - Quorum Queues usage after OpenStack upgrade is done. + With upgrade to 2024.2 (Dalmation) release and beyond, usage of RabbitMQ + Quorum Queues is mandatory to ensure high availability of queues. If you + had previously set ``oslomsg_rabbit_quorum_queues: false``, please + consider migrating before continuing with this upgrade which uses RabbitMQ + 4.x. Please, check `RabbitMQ maintenance `_ for more information about switching between Quourum and HA Queues. From ae6610becd3543be55c95552a2ee6e3a9be0b9b7 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Wed, 26 Feb 2025 10:57:00 +0100 Subject: [PATCH 11/24] Bump SHAs for 2024.2 Change-Id: Ifcd4b652dc3759dabc57432485d25b448f2dfd7d --- ansible-collection-requirements.yml | 2 +- ansible-role-requirements.yml | 28 +++++++++---------- inventory/group_vars/all/source_git.yml | 4 +-- .../group_vars/cinder_all/source_git.yml | 4 +-- .../group_vars/designate_all/source_git.yml | 4 +-- .../group_vars/glance_all/source_git.yml | 4 +-- .../group_vars/horizon_all/source_git.yml | 6 ++-- .../group_vars/ironic_all/source_git.yml | 4 +-- .../group_vars/manila_all/source_git.yml | 4 +-- .../group_vars/neutron_all/source_git.yml | 8 +++--- inventory/group_vars/nova_all/source_git.yml | 6 ++-- .../group_vars/octavia_all/source_git.yml | 6 ++-- .../group_vars/placement_all/source_git.yml | 4 +-- inventory/group_vars/trove_all/source_git.yml | 4 +-- ...ron_uwsgi_re_disable-45f28da6a4e29e54.yaml | 17 +++++++++++ 15 files changed, 61 insertions(+), 44 deletions(-) create mode 100644 releasenotes/notes/neutron_uwsgi_re_disable-45f28da6a4e29e54.yaml diff --git a/ansible-collection-requirements.yml b/ansible-collection-requirements.yml index e4870fd337..b35df015fd 100644 --- a/ansible-collection-requirements.yml +++ b/ansible-collection-requirements.yml @@ -11,7 +11,7 @@ collections: - name: openstack.osa source: https://opendev.org/openstack/openstack-ansible-plugins type: git - version: 63ece84a9f85438f44ffd3fa044b45681d1b7d8c + version: f6d58462f66d5f63aa45e1251f43baef6ae80b6b - name: community.general source: https://github.com/ansible-collections/community.general type: git diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index afb24e6b3d..0dce928fc8 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -20,9 +20,9 @@ - name: python_venv_build src: https://opendev.org/openstack/ansible-role-python_venv_build scm: git - version: ed1cb28419b8bed87bd1339ae4fde4969f1dc791 + version: 82c76f41ea8f95d995d035aaa285f72781ed66eb trackbranch: stable/2024.2 - shallow_since: '2024-11-27' + shallow_since: '2025-01-30' - name: qdrouterd scm: git src: https://opendev.org/openstack/ansible-role-qdrouterd @@ -182,15 +182,15 @@ - name: os_horizon scm: git src: https://opendev.org/openstack/openstack-ansible-os_horizon - version: 55cc1785fabee4b8c415e43127223463d5c9ef8f + version: 14de45b456940856056221dc7c63ba084f906ecb trackbranch: stable/2024.2 - shallow_since: '2024-11-27' + shallow_since: '2025-01-20' - name: os_ironic scm: git src: https://opendev.org/openstack/openstack-ansible-os_ironic - version: 1eadfb4925015a75cdc4177f93505f952fc0a18d + version: 16e97d9bd77bf7c2cea8f82933d7999adaa2f915 trackbranch: stable/2024.2 - shallow_since: '2024-11-27' + shallow_since: '2025-02-11' - name: os_keystone scm: git src: https://opendev.org/openstack/openstack-ansible-os_keystone @@ -224,9 +224,9 @@ - name: os_neutron scm: git src: https://opendev.org/openstack/openstack-ansible-os_neutron - version: cbbc303248515c5fea8b2276d390222490179856 + version: 34e76cd05425cef6f281e84edbfeaeebbf30afed trackbranch: stable/2024.2 - shallow_since: '2024-12-05' + shallow_since: '2025-02-23' - name: os_nova scm: git src: https://opendev.org/openstack/openstack-ansible-os_nova @@ -236,9 +236,9 @@ - name: os_octavia scm: git src: https://opendev.org/openstack/openstack-ansible-os_octavia - version: 17dd5a3079a6da936f55b5fc2827e39e9ed2a0d0 + version: 8a340b572b718a8cf02949cc33859ffbd3634f39 trackbranch: stable/2024.2 - shallow_since: '2024-11-27' + shallow_since: '2025-02-04' - name: os_placement scm: git src: https://opendev.org/openstack/openstack-ansible-os_placement @@ -296,9 +296,9 @@ - name: repo_server scm: git src: https://opendev.org/openstack/openstack-ansible-repo_server - version: 4606ca00eb31f65c43ec49d592a5ac70356e7721 + version: a4caa5ad92a6d907ba5c23dab589235c66a8cb86 trackbranch: stable/2024.2 - shallow_since: '2025-01-07' + shallow_since: '2025-01-09' # External dependencies - name: etcd scm: git @@ -333,6 +333,6 @@ - name: ceph-ansible scm: git src: https://github.com/ceph/ceph-ansible - version: 88b6ecef519e52fcd2b7368905f847fa53dcd1d5 + version: 5ac030cd3aa9b671ed09fc6e4f10991f08cc06a4 trackbranch: stable-8.0 - shallow_since: '2024-10-28' + shallow_since: '2025-02-10' diff --git a/inventory/group_vars/all/source_git.yml b/inventory/group_vars/all/source_git.yml index 4cd2e1648b..a98f77e42a 100644 --- a/inventory/group_vars/all/source_git.yml +++ b/inventory/group_vars/all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.11.2024 ### +### HEAD as of 26.02.2025 ### ## Global Requirements requirements_git_repo: "{{ openstack_opendev_base_url }}/openstack/requirements" -requirements_git_install_branch: 9a8c2060724233415cb3d751947eaf30f7936d58 +requirements_git_install_branch: d620ff557c22c4b8c1398b6dc84772c341fb4d5a requirements_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/cinder_all/source_git.yml b/inventory/group_vars/cinder_all/source_git.yml index 1adfebb930..c708fb7ebc 100644 --- a/inventory/group_vars/cinder_all/source_git.yml +++ b/inventory/group_vars/cinder_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 10.01.2025 ### +### HEAD as of 26.02.2025 ### ## Cinder service cinder_git_repo: "{{ openstack_opendev_base_url }}/openstack/cinder" -cinder_git_install_branch: 3a19137102d420bbbbc45ebdd9c9d7fc47427cfd +cinder_git_install_branch: 9d1a7de850ad06e9f8e242ecfeb070da22c688c4 cinder_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/designate_all/source_git.yml b/inventory/group_vars/designate_all/source_git.yml index 4549c5191f..3d1bb0fa91 100644 --- a/inventory/group_vars/designate_all/source_git.yml +++ b/inventory/group_vars/designate_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.11.2024 ### +### HEAD as of 26.02.2025 ### ## Designate service designate_git_repo: "{{ openstack_opendev_base_url }}/openstack/designate" -designate_git_install_branch: a2f6f07e2ca7d1b67b8b221bed0529e93aebc90a +designate_git_install_branch: 505ea9b1245e07b28e12c1be3ca5d5e86d77efaf designate_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/glance_all/source_git.yml b/inventory/group_vars/glance_all/source_git.yml index 7afbbf63b4..5e53a126de 100644 --- a/inventory/group_vars/glance_all/source_git.yml +++ b/inventory/group_vars/glance_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.11.2024 ### +### HEAD as of 26.02.2025 ### ## Glance service glance_git_repo: "{{ openstack_opendev_base_url }}/openstack/glance" -glance_git_install_branch: 0dcb9aff2c8f96e33a3dc1f40b5cb3c4cee758ad +glance_git_install_branch: d1cc917a29c9d2e87b1bad51a33a8a2500eb69c6 glance_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/horizon_all/source_git.yml b/inventory/group_vars/horizon_all/source_git.yml index 09a8757a15..1428824b5c 100644 --- a/inventory/group_vars/horizon_all/source_git.yml +++ b/inventory/group_vars/horizon_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 10.01.2025 ### +### HEAD as of 26.02.2025 ### ## Horizon service horizon_git_repo: "{{ openstack_opendev_base_url }}/openstack/horizon" -horizon_git_install_branch: 4bcc3dceaca8041477615a9ba54922356670a424 +horizon_git_install_branch: 23d0b9525f7c11288d503123e29db0bd66f9ca88 horizon_git_track_branch: stable/2024.2 ## Adjutant dashboard plugin @@ -52,7 +52,7 @@ ironic_dashboard_git_track_branch: stable/2024.2 ## Horizon Magnum dashboard plugin magnum_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/magnum-ui" -magnum_dashboard_git_install_branch: 5f285a0863484e521d18d2b4f2fcf6f04e543f78 +magnum_dashboard_git_install_branch: 6aff149e855b03b75778b163d5ea03bfe575f6b2 magnum_dashboard_git_track_branch: stable/2024.2 ## Horizon Masakari dashboard plugin diff --git a/inventory/group_vars/ironic_all/source_git.yml b/inventory/group_vars/ironic_all/source_git.yml index f731d0b84a..0eedf3944d 100644 --- a/inventory/group_vars/ironic_all/source_git.yml +++ b/inventory/group_vars/ironic_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 10.01.2025 ### +### HEAD as of 26.02.2025 ### ## Ironic service ironic_git_repo: "{{ openstack_opendev_base_url }}/openstack/ironic" -ironic_git_install_branch: d1872d7fcff646d8bdda876ba85bdff6f67f91cd +ironic_git_install_branch: 5aa51d6985d25acd6abfb161c62c66facc20a6ca ironic_git_track_branch: stable/2024.2 ## Ironic inspector service diff --git a/inventory/group_vars/manila_all/source_git.yml b/inventory/group_vars/manila_all/source_git.yml index ca3cf4a472..cb370bbe39 100644 --- a/inventory/group_vars/manila_all/source_git.yml +++ b/inventory/group_vars/manila_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 10.01.2025 ### +### HEAD as of 26.02.2025 ### ## Manila service manila_git_repo: "{{ openstack_opendev_base_url }}/openstack/manila" -manila_git_install_branch: 60aa36b8f8e71748ee0e492269ad97c13ca29821 +manila_git_install_branch: e8f426d55d9487412b2314cce549311c4aa23403 manila_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/neutron_all/source_git.yml b/inventory/group_vars/neutron_all/source_git.yml index c955bafc71..157e0cb33a 100644 --- a/inventory/group_vars/neutron_all/source_git.yml +++ b/inventory/group_vars/neutron_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 10.01.2025 ### +### HEAD as of 26.02.2025 ### ## Neutron service neutron_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron" -neutron_git_install_branch: 13938b047358d277623bf9e6cbf2c4dcd5a4c077 +neutron_git_install_branch: 05b77b19d791ed1cbb267466267513cfa472ff13 neutron_git_track_branch: stable/2024.2 neutron_vpnaas_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-vpnaas" @@ -49,7 +49,7 @@ networking_nsx_git_install_branch: 715cb5fc1174b9226f043e49ffd389add44f070a networking_nsx_git_track_branch: master networking_nsxlib_git_repo: "{{ openstack_opendev_base_url }}/x/vmware-nsxlib" -networking_nsxlib_git_install_branch: 62a07420a032554811c24c984ea370ecf0f6d3f1 +networking_nsxlib_git_install_branch: 895188ad7f9226aa9a923bdbb7e8857af5e3cfc7 networking_nsxlib_git_track_branch: master networking_baremetal_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-baremetal" @@ -57,5 +57,5 @@ networking_baremetal_git_install_branch: 1fba63ce21619d3fe70117c6679e53629c612bc networking_baremetal_git_track_branch: stable/2024.2 networking_ovn_bgp_git_repo: "{{ openstack_opendev_base_url }}/openstack/ovn-bgp-agent" -networking_ovn_bgp_git_install_branch: 08fb541e696e9cf5df1bcde0a0b3a9765d24a21c +networking_ovn_bgp_git_install_branch: 3120113bfac50c82a70158572dcab77d84a5e3ed networking_ovn_bgp_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/nova_all/source_git.yml b/inventory/group_vars/nova_all/source_git.yml index ec249707cc..60aae246ac 100644 --- a/inventory/group_vars/nova_all/source_git.yml +++ b/inventory/group_vars/nova_all/source_git.yml @@ -23,11 +23,11 @@ ## * All items with this file should be separated by `name_` note that the name of the ## package should be one long name with no additional `_` separating it. -### HEAD as of 10.01.2025 ### +### HEAD as of 26.02.2025 ### ## NOVNC from source novncproxy_git_repo: "{{ openstack_github_base_url }}/novnc/noVNC" -novncproxy_git_install_branch: 3193f808b5366392de94c1a9b144fc6845daeabb +novncproxy_git_install_branch: b45f35c6d7b06c1d8641ceb8e7f5ee00c23484eb novncproxy_git_track_branch: master ## spice-html5 from source @@ -37,5 +37,5 @@ spicehtml5_git_track_branch: master ## Nova service nova_git_repo: "{{ openstack_opendev_base_url }}/openstack/nova" -nova_git_install_branch: 89c07d735319801b192ddc1db0d6a8ce7abea2fc +nova_git_install_branch: 1b28f649feaf2c9929f15214814f8af950e5c19c nova_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/octavia_all/source_git.yml b/inventory/group_vars/octavia_all/source_git.yml index a3acec4894..1de9fc5b73 100644 --- a/inventory/group_vars/octavia_all/source_git.yml +++ b/inventory/group_vars/octavia_all/source_git.yml @@ -13,14 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.11.2024 ### +### HEAD as of 26.02.2025 ### ## Octavia service octavia_git_repo: "{{ openstack_opendev_base_url }}/openstack/octavia" -octavia_git_install_branch: 7aa08d17ffc93596a58194bd3ba0acaaddd25e3a +octavia_git_install_branch: e15cb80d8f325e7474fb2175a1a8e9805a473295 octavia_git_track_branch: stable/2024.2 ## Octavia OVN provider octavia_ovn_octavia_provider_git_repo: "{{ openstack_opendev_base_url }}/openstack/ovn-octavia-provider" -octavia_ovn_octavia_provider_git_install_branch: 156ca765008943d2f6de4f2d14b23e56fc660945 +octavia_ovn_octavia_provider_git_install_branch: a101619646c6dd792d10042100a78e4f2e13a3af octavia_ovn_octavia_provider_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/placement_all/source_git.yml b/inventory/group_vars/placement_all/source_git.yml index 449eca768b..23b005aa70 100644 --- a/inventory/group_vars/placement_all/source_git.yml +++ b/inventory/group_vars/placement_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 30.09.2024 ### +### HEAD as of 26.02.2025 ### ## Placement service placement_git_repo: "{{ openstack_opendev_base_url }}/openstack/placement" -placement_git_install_branch: 901dc8274a3198c38bd0faa515c729903d5d1e0d +placement_git_install_branch: 828b2559a1b3c0b59c543e851c6ea3efb1baae20 placement_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/trove_all/source_git.yml b/inventory/group_vars/trove_all/source_git.yml index d26fe9c80c..555a0f345e 100644 --- a/inventory/group_vars/trove_all/source_git.yml +++ b/inventory/group_vars/trove_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 10.01.2025 ### +### HEAD as of 26.02.2025 ### ## Trove service trove_git_repo: "{{ openstack_opendev_base_url }}/openstack/trove" -trove_git_install_branch: 95e879d42544cec28322a21bd10fa0537f88e5de +trove_git_install_branch: 93efb5f57f7bc6f683c5a5829ba9d7c955b30219 trove_git_track_branch: stable/2024.2 diff --git a/releasenotes/notes/neutron_uwsgi_re_disable-45f28da6a4e29e54.yaml b/releasenotes/notes/neutron_uwsgi_re_disable-45f28da6a4e29e54.yaml new file mode 100644 index 0000000000..e8ddbd27be --- /dev/null +++ b/releasenotes/notes/neutron_uwsgi_re_disable-45f28da6a4e29e54.yaml @@ -0,0 +1,17 @@ +--- +upgrade: + - | + A uWSGI for Neutron has been disabled again by default in favor of eventlet + server. This also stops and disables following services needed for uWSGI mode: + + * ``neutron-periodic-workers`` + * ``neutron-ovn-maintenance-worker`` + * ``neutron-rpc-server`` + +fixes: + - | + A `bug #2096937 `_ + related to HashRing generation has been reported when using uWSGI + with Neutron. In order to quickly address the bug, uWSGI mode has been + disabled again by default for Neutron until a proper fix is provided for + uWSGI. From d2d92f5925a451ee6626efe15fe880542862c472 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Mon, 3 Mar 2025 21:43:40 +0100 Subject: [PATCH 12/24] Update haproxy and rabbitmq SHA This includes bugfix backport for haproxy and rabbitmq role which is nice to have with upcoming release. Change-Id: Ib1ae408e682f494072249c31a7a3c309298b8e06 --- ansible-role-requirements.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index 0dce928fc8..657c33b1d0 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -80,7 +80,7 @@ - name: haproxy_server scm: git src: https://opendev.org/openstack/openstack-ansible-haproxy_server - version: f4846463a5ccabfefc3d23bdb6e1779247e21d45 + version: e22724aa2b3815ddad2e815cb8c44a59a3c5360d trackbranch: stable/2024.2 shallow_since: '2024-11-27' - name: lxc_container_create @@ -290,7 +290,7 @@ - name: rabbitmq_server scm: git src: https://opendev.org/openstack/openstack-ansible-rabbitmq_server - version: 1677a5e19bf11985db13145820c771ceb8d6b609 + version: e5ca2ec50570a0d28edaa37bdcd2fe4f54f32c40 trackbranch: stable/2024.2 shallow_since: '2024-12-24' - name: repo_server From 56e33edb8910c7403ebfa0d04a37c976565872a4 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Thu, 20 Mar 2025 12:50:52 +0100 Subject: [PATCH 13/24] Use first utility host as default host for openstack_resources At the moment openstack_service_setup_host is not actually respected as group_vars defaults provisionment happens during runtime of the playbook. With that, openstack_service_setup_host does have the same value by default for both distro and source installations, which is the first utility host. Let's use this value as default since it might fit most of the usecases. Closes-Bug: #2096939 Change-Id: Id3eb93a3c226185c614e324609bf7be5d789f248 (cherry picked from commit ce4f47e184b31d52498f43086751f99a2e669299) --- playbooks/openstack-resources.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbooks/openstack-resources.yml b/playbooks/openstack-resources.yml index 3551bff829..2eb5035ee3 100644 --- a/playbooks/openstack-resources.yml +++ b/playbooks/openstack-resources.yml @@ -14,7 +14,7 @@ # limitations under the License. - name: Create requested OpenStack Resources - hosts: "{{ openstack_service_setup_host | default('localhost') }}" + hosts: "{{ openstack_service_setup_host | default(groups['utility_all'][0] | default('localhost')) }}" tasks: - name: Setup installation variables include_role: From f679108353a8456d15900ef111552f3a8d09bbbb Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Thu, 8 May 2025 15:22:51 +0100 Subject: [PATCH 14/24] Remove retired qdrouterd repo from zuul jobs Change-Id: Ide9e0cdf616a4e5c5d7acaaaddc27fac8e940327 --- zuul.d/jobs.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 7b13d6ec3f..49c82118cd 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -204,7 +204,6 @@ - name: openstack/openstack-ansible-os_tempest - name: openstack/openstack-ansible-os_trove - name: openstack/openstack-ansible-plugins - - name: openstack/ansible-role-qdrouterd - name: openstack/openstack-ansible-rabbitmq_server - name: openstack/openstack-ansible-repo_server - name: openstack/ansible-role-systemd_service From b86fd4fb3c9466ae48da871142371859e10ccdf0 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Thu, 8 May 2025 12:10:49 +0200 Subject: [PATCH 15/24] Bump SHAs for 2024.2 Change-Id: I31d8d739448220a2148c94e7369bc3bfa1c19be6 --- ansible-role-requirements.yml | 20 +++++++++---------- inventory/group_vars/all/source_git.yml | 4 ++-- .../group_vars/blazar_all/source_git.yml | 4 ++-- .../group_vars/cinder_all/source_git.yml | 4 ++-- .../group_vars/designate_all/source_git.yml | 4 ++-- .../group_vars/glance_all/source_git.yml | 4 ++-- .../group_vars/gnocchi_all/source_git.yml | 4 ++-- .../group_vars/horizon_all/source_git.yml | 4 ++-- .../group_vars/ironic_all/source_git.yml | 4 ++-- .../group_vars/manila_all/source_git.yml | 4 ++-- .../group_vars/mistral_all/source_git.yml | 4 ++-- .../group_vars/neutron_all/source_git.yml | 10 +++++----- inventory/group_vars/nova_all/source_git.yml | 6 +++--- .../group_vars/octavia_all/source_git.yml | 4 ++-- inventory/group_vars/zun_all/source_git.yml | 4 ++-- 15 files changed, 42 insertions(+), 42 deletions(-) diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index 657c33b1d0..e91ca8b11b 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -74,15 +74,15 @@ - name: galera_server scm: git src: https://opendev.org/openstack/openstack-ansible-galera_server - version: 2f2912a30812c0fa46a380c0a57ac09989e8758e + version: 6684e16be27ccdb2ed260c2eedc7db0c4b185c27 trackbranch: stable/2024.2 - shallow_since: '2024-11-27' + shallow_since: '2025-05-06' - name: haproxy_server scm: git src: https://opendev.org/openstack/openstack-ansible-haproxy_server version: e22724aa2b3815ddad2e815cb8c44a59a3c5360d trackbranch: stable/2024.2 - shallow_since: '2024-11-27' + shallow_since: '2025-02-24' - name: lxc_container_create scm: git src: https://opendev.org/openstack/openstack-ansible-lxc_container_create @@ -92,9 +92,9 @@ - name: lxc_hosts scm: git src: https://opendev.org/openstack/openstack-ansible-lxc_hosts - version: 41470784fd9dc2438799f45417a9fbcef0d069d3 + version: 504024d047e066d767e9b71c10931d0c8c8d42ba trackbranch: stable/2024.2 - shallow_since: '2024-11-27' + shallow_since: '2025-03-20' - name: memcached_server scm: git src: https://opendev.org/openstack/openstack-ansible-memcached_server @@ -230,9 +230,9 @@ - name: os_nova scm: git src: https://opendev.org/openstack/openstack-ansible-os_nova - version: f8148653a16add4b70ccb9050b5dc66259be5dfa + version: 5ce463551aeda103d218d4bc66347facaa625fcf trackbranch: stable/2024.2 - shallow_since: '2024-11-27' + shallow_since: '2025-03-16' - name: os_octavia scm: git src: https://opendev.org/openstack/openstack-ansible-os_octavia @@ -292,7 +292,7 @@ src: https://opendev.org/openstack/openstack-ansible-rabbitmq_server version: e5ca2ec50570a0d28edaa37bdcd2fe4f54f32c40 trackbranch: stable/2024.2 - shallow_since: '2024-12-24' + shallow_since: '2025-03-03' - name: repo_server scm: git src: https://opendev.org/openstack/openstack-ansible-repo_server @@ -333,6 +333,6 @@ - name: ceph-ansible scm: git src: https://github.com/ceph/ceph-ansible - version: 5ac030cd3aa9b671ed09fc6e4f10991f08cc06a4 + version: 35131407e9858cc168baa1590f236c092336d0e3 trackbranch: stable-8.0 - shallow_since: '2025-02-10' + shallow_since: '2025-03-17' diff --git a/inventory/group_vars/all/source_git.yml b/inventory/group_vars/all/source_git.yml index a98f77e42a..6e9e12cf63 100644 --- a/inventory/group_vars/all/source_git.yml +++ b/inventory/group_vars/all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.02.2025 ### +### HEAD as of 08.05.2025 ### ## Global Requirements requirements_git_repo: "{{ openstack_opendev_base_url }}/openstack/requirements" -requirements_git_install_branch: d620ff557c22c4b8c1398b6dc84772c341fb4d5a +requirements_git_install_branch: 3a697f8e7a691db0c0a8cef883df130901338182 requirements_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/blazar_all/source_git.yml b/inventory/group_vars/blazar_all/source_git.yml index c5e5e94d0b..146fcbce92 100644 --- a/inventory/group_vars/blazar_all/source_git.yml +++ b/inventory/group_vars/blazar_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.11.2024 ### +### HEAD as of 08.05.2025 ### ## Blazar service blazar_git_repo: "{{ openstack_opendev_base_url }}/openstack/blazar" -blazar_git_install_branch: 03630d9ffd3d0b585cb337400fe6c0c6facd9aac +blazar_git_install_branch: f1676c7ce465709462a558fddab9ba0977f73ff9 blazar_git_track_branch: stable/2024.2 ## Blazar Nova Service diff --git a/inventory/group_vars/cinder_all/source_git.yml b/inventory/group_vars/cinder_all/source_git.yml index c708fb7ebc..fc721f0c80 100644 --- a/inventory/group_vars/cinder_all/source_git.yml +++ b/inventory/group_vars/cinder_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.02.2025 ### +### HEAD as of 08.05.2025 ### ## Cinder service cinder_git_repo: "{{ openstack_opendev_base_url }}/openstack/cinder" -cinder_git_install_branch: 9d1a7de850ad06e9f8e242ecfeb070da22c688c4 +cinder_git_install_branch: bb37fbbe081723de3ef609f64983ea40be5e711a cinder_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/designate_all/source_git.yml b/inventory/group_vars/designate_all/source_git.yml index 3d1bb0fa91..707dac55a3 100644 --- a/inventory/group_vars/designate_all/source_git.yml +++ b/inventory/group_vars/designate_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.02.2025 ### +### HEAD as of 08.05.2025 ### ## Designate service designate_git_repo: "{{ openstack_opendev_base_url }}/openstack/designate" -designate_git_install_branch: 505ea9b1245e07b28e12c1be3ca5d5e86d77efaf +designate_git_install_branch: 5490df4e6b60f00e31e0ff57f863e406728e4eef designate_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/glance_all/source_git.yml b/inventory/group_vars/glance_all/source_git.yml index 5e53a126de..4bb5d5382e 100644 --- a/inventory/group_vars/glance_all/source_git.yml +++ b/inventory/group_vars/glance_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.02.2025 ### +### HEAD as of 08.05.2025 ### ## Glance service glance_git_repo: "{{ openstack_opendev_base_url }}/openstack/glance" -glance_git_install_branch: d1cc917a29c9d2e87b1bad51a33a8a2500eb69c6 +glance_git_install_branch: a42105b13a3e3bcae9a96fef234a2b941ade47c2 glance_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/gnocchi_all/source_git.yml b/inventory/group_vars/gnocchi_all/source_git.yml index edbe0e3ef9..a627d1a3a3 100644 --- a/inventory/group_vars/gnocchi_all/source_git.yml +++ b/inventory/group_vars/gnocchi_all/source_git.yml @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.11.2024 ### +### HEAD as of 08.05.2025 ### ## Gnocchi service ## This service has a different stable branch strategy to the rest of OpenStack. ## The SHA is recorded here to make the SHA updating easier. gnocchi_git_repo: "{{ openstack_github_base_url }}/gnocchixyz/gnocchi" -gnocchi_git_install_branch: b6895c44b5cc36a31176058a9b1e5ef6f65c31fb +gnocchi_git_install_branch: 1554674704e39c69b1193f7e1184407c7f45bf8f gnocchi_git_track_branch: stable/4.6 diff --git a/inventory/group_vars/horizon_all/source_git.yml b/inventory/group_vars/horizon_all/source_git.yml index 1428824b5c..786f5b11dd 100644 --- a/inventory/group_vars/horizon_all/source_git.yml +++ b/inventory/group_vars/horizon_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.02.2025 ### +### HEAD as of 08.05.2025 ### ## Horizon service horizon_git_repo: "{{ openstack_opendev_base_url }}/openstack/horizon" -horizon_git_install_branch: 23d0b9525f7c11288d503123e29db0bd66f9ca88 +horizon_git_install_branch: 1d2f6735e02f57b45978ea845ef501f082835f54 horizon_git_track_branch: stable/2024.2 ## Adjutant dashboard plugin diff --git a/inventory/group_vars/ironic_all/source_git.yml b/inventory/group_vars/ironic_all/source_git.yml index 0eedf3944d..d3160ea0cf 100644 --- a/inventory/group_vars/ironic_all/source_git.yml +++ b/inventory/group_vars/ironic_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.02.2025 ### +### HEAD as of 08.05.2025 ### ## Ironic service ironic_git_repo: "{{ openstack_opendev_base_url }}/openstack/ironic" -ironic_git_install_branch: 5aa51d6985d25acd6abfb161c62c66facc20a6ca +ironic_git_install_branch: 76ed064072f52eb496ff5d1023bfaf0371d0501e ironic_git_track_branch: stable/2024.2 ## Ironic inspector service diff --git a/inventory/group_vars/manila_all/source_git.yml b/inventory/group_vars/manila_all/source_git.yml index cb370bbe39..3ac99a4338 100644 --- a/inventory/group_vars/manila_all/source_git.yml +++ b/inventory/group_vars/manila_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.02.2025 ### +### HEAD as of 08.05.2025 ### ## Manila service manila_git_repo: "{{ openstack_opendev_base_url }}/openstack/manila" -manila_git_install_branch: e8f426d55d9487412b2314cce549311c4aa23403 +manila_git_install_branch: ba013661c87967488115dc671af98b76f034d6fa manila_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/mistral_all/source_git.yml b/inventory/group_vars/mistral_all/source_git.yml index 6e1afb571a..75cb7503d6 100644 --- a/inventory/group_vars/mistral_all/source_git.yml +++ b/inventory/group_vars/mistral_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 30.09.2024 ### +### HEAD as of 08.05.2025 ### ## Mistral service mistral_git_repo: "{{ openstack_opendev_base_url }}/openstack/mistral" -mistral_git_install_branch: c4d32f8ae4c56955a97031f087b8e269ec8e45ab +mistral_git_install_branch: cfc1b44046c242ad3679a60cc2abeb00f02e6658 mistral_git_track_branch: stable/2024.2 mistral_extra_git_repo: "{{ openstack_opendev_base_url }}/openstack/mistral-extra" diff --git a/inventory/group_vars/neutron_all/source_git.yml b/inventory/group_vars/neutron_all/source_git.yml index 157e0cb33a..e78cd3d9f0 100644 --- a/inventory/group_vars/neutron_all/source_git.yml +++ b/inventory/group_vars/neutron_all/source_git.yml @@ -13,15 +13,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.02.2025 ### +### HEAD as of 08.05.2025 ### ## Neutron service neutron_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron" -neutron_git_install_branch: 05b77b19d791ed1cbb267466267513cfa472ff13 +neutron_git_install_branch: 8bd7be46964af361dcb1ed339c01c64e54b90f09 neutron_git_track_branch: stable/2024.2 neutron_vpnaas_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-vpnaas" -neutron_vpnaas_git_install_branch: 990e478b1e6db459b6cb9aec53ce808e2957bb65 +neutron_vpnaas_git_install_branch: 11ffc53800e528d0b0544f7467a7487e0822bd3f neutron_vpnaas_git_track_branch: stable/2024.2 neutron_fwaas_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-fwaas" @@ -49,7 +49,7 @@ networking_nsx_git_install_branch: 715cb5fc1174b9226f043e49ffd389add44f070a networking_nsx_git_track_branch: master networking_nsxlib_git_repo: "{{ openstack_opendev_base_url }}/x/vmware-nsxlib" -networking_nsxlib_git_install_branch: 895188ad7f9226aa9a923bdbb7e8857af5e3cfc7 +networking_nsxlib_git_install_branch: b49988f87a9fedb7e79041359a2bc7df1bf170e5 networking_nsxlib_git_track_branch: master networking_baremetal_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-baremetal" @@ -57,5 +57,5 @@ networking_baremetal_git_install_branch: 1fba63ce21619d3fe70117c6679e53629c612bc networking_baremetal_git_track_branch: stable/2024.2 networking_ovn_bgp_git_repo: "{{ openstack_opendev_base_url }}/openstack/ovn-bgp-agent" -networking_ovn_bgp_git_install_branch: 3120113bfac50c82a70158572dcab77d84a5e3ed +networking_ovn_bgp_git_install_branch: 704742076a28c13b811ea37e71dae1e4b0aca573 networking_ovn_bgp_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/nova_all/source_git.yml b/inventory/group_vars/nova_all/source_git.yml index 60aae246ac..d94673cc80 100644 --- a/inventory/group_vars/nova_all/source_git.yml +++ b/inventory/group_vars/nova_all/source_git.yml @@ -23,11 +23,11 @@ ## * All items with this file should be separated by `name_` note that the name of the ## package should be one long name with no additional `_` separating it. -### HEAD as of 26.02.2025 ### +### HEAD as of 08.05.2025 ### ## NOVNC from source novncproxy_git_repo: "{{ openstack_github_base_url }}/novnc/noVNC" -novncproxy_git_install_branch: b45f35c6d7b06c1d8641ceb8e7f5ee00c23484eb +novncproxy_git_install_branch: 4cb5aa45ae559f8fa85fe2b424abbc6ef6d4c6f9 novncproxy_git_track_branch: master ## spice-html5 from source @@ -37,5 +37,5 @@ spicehtml5_git_track_branch: master ## Nova service nova_git_repo: "{{ openstack_opendev_base_url }}/openstack/nova" -nova_git_install_branch: 1b28f649feaf2c9929f15214814f8af950e5c19c +nova_git_install_branch: cebbceb2cd0260738963b1e602e85e3a46b66bec nova_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/octavia_all/source_git.yml b/inventory/group_vars/octavia_all/source_git.yml index 1de9fc5b73..175644c54e 100644 --- a/inventory/group_vars/octavia_all/source_git.yml +++ b/inventory/group_vars/octavia_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.02.2025 ### +### HEAD as of 08.05.2025 ### ## Octavia service octavia_git_repo: "{{ openstack_opendev_base_url }}/openstack/octavia" -octavia_git_install_branch: e15cb80d8f325e7474fb2175a1a8e9805a473295 +octavia_git_install_branch: 8e02055af0e0c8840076a3b76cbf1c254882ed44 octavia_git_track_branch: stable/2024.2 ## Octavia OVN provider diff --git a/inventory/group_vars/zun_all/source_git.yml b/inventory/group_vars/zun_all/source_git.yml index 716a7172db..aef7151e90 100644 --- a/inventory/group_vars/zun_all/source_git.yml +++ b/inventory/group_vars/zun_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 30.09.2024 ### +### HEAD as of 08.05.2025 ### ## Zun service zun_git_repo: "{{ openstack_opendev_base_url }}/openstack/zun" -zun_git_install_branch: e5a1e10a4d95684e26b71084239f82af4bd5b41d +zun_git_install_branch: 49566b75957a604f85b308069623b9e9bfb43ae7 zun_git_track_branch: stable/2024.2 ## Zun kuryr service From 94eff571b4665136db522952141ed8b8a4362ea7 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Wed, 28 May 2025 13:43:33 +0200 Subject: [PATCH 16/24] Do not require full git & autoconf on EL There should be no need in installing full git as well as autoconf, as we are not requiring them on DEB systems either. They require a lot of Perl dependencies, which we can simply avoid. Change-Id: Id3ca13aa7e0b521a10318c72c4095c4eb97bdeec (cherry picked from commit 2c2723e756cf9bec96dc7039947dbac74c5943e4) --- scripts/bootstrap-ansible.sh | 2 +- tests/roles/bootstrap-host/vars/redhat.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh index 17a450d79b..e6214dde88 100755 --- a/scripts/bootstrap-ansible.sh +++ b/scripts/bootstrap-ansible.sh @@ -98,7 +98,7 @@ esac case ${DISTRO_ID} in rocky|centos|rhel) dnf -y install \ - git /usr/bin/curl autoconf gcc gcc-c++ nc \ + git-core /usr/bin/curl gcc gcc-c++ nc \ systemd-devel pkgconf \ openssl-devel libffi-devel \ rsync wget diff --git a/tests/roles/bootstrap-host/vars/redhat.yml b/tests/roles/bootstrap-host/vars/redhat.yml index 4cc683fc21..8633d7f742 100644 --- a/tests/roles/bootstrap-host/vars/redhat.yml +++ b/tests/roles/bootstrap-host/vars/redhat.yml @@ -16,7 +16,7 @@ packages_install: - dbus - ethtool - - git + - git-core - iputils - lvm2 - python3 From 5db94eb2cba89ca15ee1ba31f3b17a130ed4d0d8 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Mon, 26 May 2025 17:36:18 +0200 Subject: [PATCH 17/24] Bump SHAs for 2024.2 Change-Id: I0eebedd2788487e840ec0a8bc6492c851e5c9122 --- ansible-role-requirements.yml | 14 +++++++------- inventory/group_vars/all/source_git.yml | 4 ++-- inventory/group_vars/blazar_all/source_git.yml | 4 ++-- inventory/group_vars/cinder_all/source_git.yml | 4 ++-- inventory/group_vars/designate_all/source_git.yml | 4 ++-- inventory/group_vars/glance_all/source_git.yml | 4 ++-- inventory/group_vars/horizon_all/source_git.yml | 4 ++-- inventory/group_vars/ironic_all/source_git.yml | 4 ++-- inventory/group_vars/neutron_all/source_git.yml | 4 ++-- inventory/group_vars/nova_all/source_git.yml | 4 ++-- .../aa_disable_respect_code-f15967693989df79.yaml | 8 ++++++++ .../notes/archive_mariadb-2c04a473b25a3bbb.yaml | 11 +++++++++++ .../notes/lxc_apparmor_issue-e25bbc97e7f2ba62.yaml | 10 ++++++++++ 13 files changed, 54 insertions(+), 25 deletions(-) create mode 100644 releasenotes/notes/aa_disable_respect_code-f15967693989df79.yaml create mode 100644 releasenotes/notes/archive_mariadb-2c04a473b25a3bbb.yaml create mode 100644 releasenotes/notes/lxc_apparmor_issue-e25bbc97e7f2ba62.yaml diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index e91ca8b11b..3e24d12cb7 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -76,7 +76,7 @@ src: https://opendev.org/openstack/openstack-ansible-galera_server version: 6684e16be27ccdb2ed260c2eedc7db0c4b185c27 trackbranch: stable/2024.2 - shallow_since: '2025-05-06' + shallow_since: '2025-05-07' - name: haproxy_server scm: git src: https://opendev.org/openstack/openstack-ansible-haproxy_server @@ -92,9 +92,9 @@ - name: lxc_hosts scm: git src: https://opendev.org/openstack/openstack-ansible-lxc_hosts - version: 504024d047e066d767e9b71c10931d0c8c8d42ba + version: a58cde80d982496a0dd0b4ad35f101ebb0c8db23 trackbranch: stable/2024.2 - shallow_since: '2025-03-20' + shallow_since: '2025-05-14' - name: memcached_server scm: git src: https://opendev.org/openstack/openstack-ansible-memcached_server @@ -182,9 +182,9 @@ - name: os_horizon scm: git src: https://opendev.org/openstack/openstack-ansible-os_horizon - version: 14de45b456940856056221dc7c63ba084f906ecb + version: 5187e725ecf49117bde8e72edbe43549afd81f0d trackbranch: stable/2024.2 - shallow_since: '2025-01-20' + shallow_since: '2025-05-15' - name: os_ironic scm: git src: https://opendev.org/openstack/openstack-ansible-os_ironic @@ -224,9 +224,9 @@ - name: os_neutron scm: git src: https://opendev.org/openstack/openstack-ansible-os_neutron - version: 34e76cd05425cef6f281e84edbfeaeebbf30afed + version: 0a05da9f95e6efb195d6b1f0e3dfa0e64a2a7ff1 trackbranch: stable/2024.2 - shallow_since: '2025-02-23' + shallow_since: '2025-05-15' - name: os_nova scm: git src: https://opendev.org/openstack/openstack-ansible-os_nova diff --git a/inventory/group_vars/all/source_git.yml b/inventory/group_vars/all/source_git.yml index 6e9e12cf63..821954050f 100644 --- a/inventory/group_vars/all/source_git.yml +++ b/inventory/group_vars/all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 08.05.2025 ### +### HEAD as of 24.06.2025 ### ## Global Requirements requirements_git_repo: "{{ openstack_opendev_base_url }}/openstack/requirements" -requirements_git_install_branch: 3a697f8e7a691db0c0a8cef883df130901338182 +requirements_git_install_branch: 79853815570c7527b0d48e8de741228fab924e68 requirements_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/blazar_all/source_git.yml b/inventory/group_vars/blazar_all/source_git.yml index 146fcbce92..46ca3f471f 100644 --- a/inventory/group_vars/blazar_all/source_git.yml +++ b/inventory/group_vars/blazar_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 08.05.2025 ### +### HEAD as of 26.05.2025 ### ## Blazar service blazar_git_repo: "{{ openstack_opendev_base_url }}/openstack/blazar" -blazar_git_install_branch: f1676c7ce465709462a558fddab9ba0977f73ff9 +blazar_git_install_branch: c05c4fa3fd09951dd8be46ae33dd21b1bbf528b9 blazar_git_track_branch: stable/2024.2 ## Blazar Nova Service diff --git a/inventory/group_vars/cinder_all/source_git.yml b/inventory/group_vars/cinder_all/source_git.yml index fc721f0c80..89b6ce9640 100644 --- a/inventory/group_vars/cinder_all/source_git.yml +++ b/inventory/group_vars/cinder_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 08.05.2025 ### +### HEAD as of 26.05.2025 ### ## Cinder service cinder_git_repo: "{{ openstack_opendev_base_url }}/openstack/cinder" -cinder_git_install_branch: bb37fbbe081723de3ef609f64983ea40be5e711a +cinder_git_install_branch: 7279ad6b80e20a5aa4b4fa1ad6b90ad366e63a5d cinder_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/designate_all/source_git.yml b/inventory/group_vars/designate_all/source_git.yml index 707dac55a3..6b74fa8905 100644 --- a/inventory/group_vars/designate_all/source_git.yml +++ b/inventory/group_vars/designate_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 08.05.2025 ### +### HEAD as of 26.05.2025 ### ## Designate service designate_git_repo: "{{ openstack_opendev_base_url }}/openstack/designate" -designate_git_install_branch: 5490df4e6b60f00e31e0ff57f863e406728e4eef +designate_git_install_branch: 5bfc35864c28a97ded6104dea05fa9691a7f14d8 designate_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/glance_all/source_git.yml b/inventory/group_vars/glance_all/source_git.yml index 4bb5d5382e..c834e4f28d 100644 --- a/inventory/group_vars/glance_all/source_git.yml +++ b/inventory/group_vars/glance_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 08.05.2025 ### +### HEAD as of 24.06.2025 ### ## Glance service glance_git_repo: "{{ openstack_opendev_base_url }}/openstack/glance" -glance_git_install_branch: a42105b13a3e3bcae9a96fef234a2b941ade47c2 +glance_git_install_branch: 097f38158189efc5c7d52fd56467455a58442c73 glance_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/horizon_all/source_git.yml b/inventory/group_vars/horizon_all/source_git.yml index 786f5b11dd..5e2d4b59ec 100644 --- a/inventory/group_vars/horizon_all/source_git.yml +++ b/inventory/group_vars/horizon_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 08.05.2025 ### +### HEAD as of 24.06.2025 ### ## Horizon service horizon_git_repo: "{{ openstack_opendev_base_url }}/openstack/horizon" -horizon_git_install_branch: 1d2f6735e02f57b45978ea845ef501f082835f54 +horizon_git_install_branch: 1d88ebef7535ea45901f8eb3448eee88956d6bbc horizon_git_track_branch: stable/2024.2 ## Adjutant dashboard plugin diff --git a/inventory/group_vars/ironic_all/source_git.yml b/inventory/group_vars/ironic_all/source_git.yml index d3160ea0cf..854fee84f5 100644 --- a/inventory/group_vars/ironic_all/source_git.yml +++ b/inventory/group_vars/ironic_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 08.05.2025 ### +### HEAD as of 24.06.2025 ### ## Ironic service ironic_git_repo: "{{ openstack_opendev_base_url }}/openstack/ironic" -ironic_git_install_branch: 76ed064072f52eb496ff5d1023bfaf0371d0501e +ironic_git_install_branch: 1fb5bba81ee4a8a6f05119fd7aefc3b47f40b94b ironic_git_track_branch: stable/2024.2 ## Ironic inspector service diff --git a/inventory/group_vars/neutron_all/source_git.yml b/inventory/group_vars/neutron_all/source_git.yml index e78cd3d9f0..be379f9308 100644 --- a/inventory/group_vars/neutron_all/source_git.yml +++ b/inventory/group_vars/neutron_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 08.05.2025 ### +### HEAD as of 24.06.2025 ### ## Neutron service neutron_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron" -neutron_git_install_branch: 8bd7be46964af361dcb1ed339c01c64e54b90f09 +neutron_git_install_branch: 2753d8c86ffa408a19a3d9f7a2aac3ef1582006d neutron_git_track_branch: stable/2024.2 neutron_vpnaas_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-vpnaas" diff --git a/inventory/group_vars/nova_all/source_git.yml b/inventory/group_vars/nova_all/source_git.yml index d94673cc80..9d32e6250f 100644 --- a/inventory/group_vars/nova_all/source_git.yml +++ b/inventory/group_vars/nova_all/source_git.yml @@ -23,7 +23,7 @@ ## * All items with this file should be separated by `name_` note that the name of the ## package should be one long name with no additional `_` separating it. -### HEAD as of 08.05.2025 ### +### HEAD as of 24.06.2025 ### ## NOVNC from source novncproxy_git_repo: "{{ openstack_github_base_url }}/novnc/noVNC" @@ -37,5 +37,5 @@ spicehtml5_git_track_branch: master ## Nova service nova_git_repo: "{{ openstack_opendev_base_url }}/openstack/nova" -nova_git_install_branch: cebbceb2cd0260738963b1e602e85e3a46b66bec +nova_git_install_branch: 88e49dd65c58536ba8dd39ab7cfde669a433f3f6 nova_git_track_branch: stable/2024.2 diff --git a/releasenotes/notes/aa_disable_respect_code-f15967693989df79.yaml b/releasenotes/notes/aa_disable_respect_code-f15967693989df79.yaml new file mode 100644 index 0000000000..ce5a8e6fde --- /dev/null +++ b/releasenotes/notes/aa_disable_respect_code-f15967693989df79.yaml @@ -0,0 +1,8 @@ +--- +fixes: + - | + ``os_neutron`` role was ignoring actual exit code of ``aa-disable`` command, + when it was exiting abnormally. It could result in unobvious failures later + in neutron agents. + This was fixed and the role will fail if ``aa-disable`` fails to disable + required apparmor profiles instead of suppressing the issue. diff --git a/releasenotes/notes/archive_mariadb-2c04a473b25a3bbb.yaml b/releasenotes/notes/archive_mariadb-2c04a473b25a3bbb.yaml new file mode 100644 index 0000000000..2d65902db3 --- /dev/null +++ b/releasenotes/notes/archive_mariadb-2c04a473b25a3bbb.yaml @@ -0,0 +1,11 @@ +--- +fixes: + - | + With change of policy regarding stored versions of MariaDB in + ``mirror.mariadb.org``, currently pinned MariaDB versions were removed + from the repo. + With a switch to ``archive.mariadb.org``, this should resolve failing + installation for MariaDB. +other: + - | + Mirror for MariaDB has been switched to ``archive.mariadb.org`` diff --git a/releasenotes/notes/lxc_apparmor_issue-e25bbc97e7f2ba62.yaml b/releasenotes/notes/lxc_apparmor_issue-e25bbc97e7f2ba62.yaml new file mode 100644 index 0000000000..e0592b5c32 --- /dev/null +++ b/releasenotes/notes/lxc_apparmor_issue-e25bbc97e7f2ba62.yaml @@ -0,0 +1,10 @@ +--- +issues: + - | + It was discovered that LXC 5.0.3 in Ubuntu 24.04 (Noble Numbat) + contains packaging issue resulting in apparmor profiling conflicts. + A temporary workaround has been applied in ``lxc_hosts`` role to + apply a hotfix to the profile. However, it will be wiped with the + next update of ``liblxc-common`` package. + Please, check the `bug #2110635 `_ + for more details on the issue. From e0ead74d0f48e500e63d286f7997b520e8bd19cb Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Wed, 19 Mar 2025 17:48:16 +0100 Subject: [PATCH 18/24] Move argument parsing for dynamic_inventory to generate At the moment osa_toolkit is installable as a package. With recent changes to PBR for python3.12 console_scripts are no longer installed "as is", but only a simple import is created. This change results in broken `openstack-ansible-inventory` binary, as `inventory` can not be imported. To avoid the issue and follow our existing logic for rest of tooling, we move argument parsing logic to generate.py itself, allowing it to be self-sufficient and be leaving a dynamic_inventory.py as a simple pointer which needs to stay in inventory folder for gropup_vars to load properly. Change-Id: Ie6d68f9c7b91d88736c5fc67c997cffd812afc61 Signed-off-by: Dmitriy Rabotyagov --- inventory/dynamic_inventory.py | 52 +----------------------- osa_toolkit/generate.py | 74 +++++++++++++++++++++++++++++++--- setup.cfg | 2 +- tests/test_inventory.py | 13 +++--- 4 files changed, 77 insertions(+), 64 deletions(-) mode change 100755 => 100644 osa_toolkit/generate.py diff --git a/inventory/dynamic_inventory.py b/inventory/dynamic_inventory.py index ebb8720a39..5a41a4b8d2 100755 --- a/inventory/dynamic_inventory.py +++ b/inventory/dynamic_inventory.py @@ -15,7 +15,6 @@ # # (c) 2014, Kevin Carter -import argparse import os import sys @@ -28,57 +27,8 @@ from osa_toolkit import generate -# Function kept in order to use relative pathing for the env.d directory -def args(arg_list): - """Setup argument Parsing.""" - parser = argparse.ArgumentParser( - usage='%(prog)s', - description='OpenStack Inventory Generator', - epilog='Inventory Generator Licensed "Apache 2.0"') - - parser.add_argument( - '--config', - help='Path containing the user defined configuration files', - required=False, - default=os.getenv('OSA_CONFIG_DIR', None) - ) - parser.add_argument( - '--list', - help='List all entries', - action='store_true' - ) - - parser.add_argument( - '--check', - help="Configuration check only, don't generate inventory", - action='store_true', - ) - - parser.add_argument( - '-d', - '--debug', - help=('Output debug messages to log file. ' - 'File is appended to, not overwritten'), - action='store_true', - default=False, - ) - - parser.add_argument( - '-e', - '--environment', - help=('Directory that contains the base env.d directory.\n' - 'Defaults to /inventory/.'), - required=False, - default=os.path.dirname(__file__), - ) - - return vars(parser.parse_args(arg_list)) - - def main(): - all_args = args(sys.argv[1:]) - output = generate.main(**all_args) - print(output) + generate.main() if __name__ == '__main__': diff --git a/osa_toolkit/generate.py b/osa_toolkit/generate.py old mode 100755 new mode 100644 index cfa89c556f..ab932886e9 --- a/osa_toolkit/generate.py +++ b/osa_toolkit/generate.py @@ -15,17 +15,23 @@ # # (c) 2014, Kevin Carter +import argparse import copy import json import logging -import netaddr -from osa_toolkit import dictutils as du -from osa_toolkit import filesystem as filesys -from osa_toolkit import ip +from os import getenv as os_env +from os import path as os_path import re +import sys import uuid import warnings +import netaddr + +from osa_toolkit import __path__ as repo_path +from osa_toolkit import dictutils as du +from osa_toolkit import filesystem as filesys +from osa_toolkit import ip logger = logging.getLogger('osa-inventory') @@ -50,6 +56,53 @@ ] +def args(argv): + """Setup argument Parsing.""" + parser = argparse.ArgumentParser( + usage='%(prog)s', + description='OpenStack Inventory Generator', + epilog='Inventory Generator Licensed "Apache 2.0"') + + parser.add_argument( + '--config', + help='Path containing the user defined configuration files', + required=False, + default=os_env('OSA_CONFIG_DIR', None) + ) + + parser.add_argument( + '--list', + help='List all entries', + action='store_true' + ) + + parser.add_argument( + '--check', + help="Configuration check only, don't generate inventory", + action='store_true', + ) + + parser.add_argument( + '-d', + '--debug', + help=('Output debug messages to log file. ' + 'File is appended to, not overwritten'), + action='store_true', + default=False, + ) + + parser.add_argument( + '-e', + '--environment', + help=('Directory that contains the base env.d directory.\n' + 'Defaults to /inventory/.'), + required=False, + default=f'{os_path.dirname(repo_path[0])}/inventory', + ) + + return vars(parser.parse_args(argv)) + + class MultipleHostsWithOneIPError(Exception): def __init__(self, ip, assigned_host, new_host): self.ip = ip @@ -1139,7 +1192,11 @@ def _prepare_debug_logger(): logger.info("Beginning new inventory run") -def main(config=None, check=False, debug=False, environment=None, **kwargs): +def generate(config=None, + check=False, + debug=False, + environment=None, + **kwargs): """Run the main application. :param config: ``str`` Directory from which to pull configs and overrides @@ -1263,3 +1320,10 @@ def main(config=None, check=False, debug=False, environment=None, **kwargs): filesys.save_inventory(inventory_json, inv_path) return inventory_json + + +def main(argv=sys.argv[1:]): + + all_args = args(argv) + data = generate(**all_args) + print(data) diff --git a/setup.cfg b/setup.cfg index 4376fbbe33..e1d27624fe 100644 --- a/setup.cfg +++ b/setup.cfg @@ -28,4 +28,4 @@ packages = osa_toolkit [entry_points] console_scripts = - openstack-ansible-inventory = inventory.dynamic_inventory:main + openstack-ansible-inventory = osa_toolkit.generate:main diff --git a/tests/test_inventory.py b/tests/test_inventory.py index ed8fd0001a..ff90303065 100644 --- a/tests/test_inventory.py +++ b/tests/test_inventory.py @@ -29,7 +29,6 @@ sys.path.append(path.join(os.getcwd(), INV_DIR)) -import dynamic_inventory # noqa: E402 from osa_toolkit import dictutils # noqa: E402 from osa_toolkit import filesystem as fs # noqa: E402 from osa_toolkit import generate as di # noqa: E402 @@ -102,7 +101,7 @@ def get_inventory(clean=True, extra_args=None): if extra_args: args.update(extra_args) try: - inventory_string = di.main(**args) + inventory_string = di.generate(**args) inventory = json.loads(inventory_string) return inventory finally: @@ -114,16 +113,16 @@ def get_inventory(clean=True, extra_args=None): class TestArgParser(unittest.TestCase): def test_no_args(self): - arg_dict = dynamic_inventory.args([]) + arg_dict = di.args([]) self.assertIsNone(arg_dict['config']) self.assertEqual(arg_dict['list'], False) def test_list_arg(self): - arg_dict = dynamic_inventory.args(['--list']) + arg_dict = di.args(['--list']) self.assertEqual(arg_dict['list'], True) def test_config_arg(self): - arg_dict = dynamic_inventory.args(['--config', + arg_dict = di.args(['--config', '/etc/openstack_deploy']) self.assertEqual(arg_dict['config'], '/etc/openstack_deploy') @@ -1269,7 +1268,7 @@ def duplicate_ip(self): self.user_defined_config['dashboard_hosts']['bogus'] = ip def test_checking_good_config(self): - output = di.main(config=TARGET_DIR, check=True, + output = di.generate(config=TARGET_DIR, check=True, environment=BASE_ENV_DIR) self.assertEqual(output, 'Configuration ok!') @@ -1277,7 +1276,7 @@ def test_duplicated_ip(self): self.duplicate_ip() self.write_config() with self.assertRaises(di.MultipleHostsWithOneIPError) as context: - di.main(config=TARGET_DIR, check=True, environment=BASE_ENV_DIR) + di.generate(config=TARGET_DIR, check=True, environment=BASE_ENV_DIR) self.assertEqual(context.exception.ip, '172.29.236.100') From 459a4cdbceae9036a54878d60b891e1c68de0f84 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Mon, 29 Sep 2025 16:00:00 +0200 Subject: [PATCH 19/24] Bump SHAs for 2024.2 Change-Id: I3b2b0266f05014a2b6fa2d397fcedbd1090411d6 Signed-off-by: Dmitriy Rabotyagov --- ansible-collection-requirements.yml | 2 +- ansible-role-requirements.yml | 14 +++++++------- inventory/group_vars/adjutant_all/source_git.yml | 4 ++-- inventory/group_vars/all/source_git.yml | 4 ++-- inventory/group_vars/blazar_all/source_git.yml | 4 ++-- inventory/group_vars/ceilometer_all/source_git.yml | 4 ++-- inventory/group_vars/cinder_all/source_git.yml | 4 ++-- inventory/group_vars/cloudkitty_all/source_git.yml | 4 ++-- inventory/group_vars/heat_all/source_git.yml | 4 ++-- inventory/group_vars/horizon_all/source_git.yml | 8 ++++---- inventory/group_vars/magnum_all/source_git.yml | 4 ++-- inventory/group_vars/manila_all/source_git.yml | 4 ++-- inventory/group_vars/mistral_all/source_git.yml | 4 ++-- inventory/group_vars/neutron_all/source_git.yml | 6 +++--- inventory/group_vars/nova_all/source_git.yml | 6 +++--- inventory/group_vars/octavia_all/source_git.yml | 6 +++--- inventory/group_vars/swift_all/source_git.yml | 4 ++-- 17 files changed, 43 insertions(+), 43 deletions(-) diff --git a/ansible-collection-requirements.yml b/ansible-collection-requirements.yml index b35df015fd..7d3ae405bd 100644 --- a/ansible-collection-requirements.yml +++ b/ansible-collection-requirements.yml @@ -11,7 +11,7 @@ collections: - name: openstack.osa source: https://opendev.org/openstack/openstack-ansible-plugins type: git - version: f6d58462f66d5f63aa45e1251f43baef6ae80b6b + version: 2cfba0520eee0b5416555c200e67366cefbb9365 - name: community.general source: https://github.com/ansible-collections/community.general type: git diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index 3e24d12cb7..e388d7a2bf 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -74,9 +74,9 @@ - name: galera_server scm: git src: https://opendev.org/openstack/openstack-ansible-galera_server - version: 6684e16be27ccdb2ed260c2eedc7db0c4b185c27 + version: 7d46ef260cc432257a56b7b567666f1ea7fc99fe trackbranch: stable/2024.2 - shallow_since: '2025-05-07' + shallow_since: '2025-06-03' - name: haproxy_server scm: git src: https://opendev.org/openstack/openstack-ansible-haproxy_server @@ -200,9 +200,9 @@ - name: os_magnum scm: git src: https://opendev.org/openstack/openstack-ansible-os_magnum - version: be694a172572ea249fd671a4dc9d2b1b654f546a + version: 24bb7b4f70be1dc32f4a1dc28ec78640593576ee trackbranch: stable/2024.2 - shallow_since: '2024-11-27' + shallow_since: '2025-06-29' - name: os_manila scm: git src: https://opendev.org/openstack/openstack-ansible-os_manila @@ -292,7 +292,7 @@ src: https://opendev.org/openstack/openstack-ansible-rabbitmq_server version: e5ca2ec50570a0d28edaa37bdcd2fe4f54f32c40 trackbranch: stable/2024.2 - shallow_since: '2025-03-03' + shallow_since: '2025-03-02' - name: repo_server scm: git src: https://opendev.org/openstack/openstack-ansible-repo_server @@ -333,6 +333,6 @@ - name: ceph-ansible scm: git src: https://github.com/ceph/ceph-ansible - version: 35131407e9858cc168baa1590f236c092336d0e3 + version: 1a613004e3fb3804f26a60369cec32ef9255bd2d trackbranch: stable-8.0 - shallow_since: '2025-03-17' + shallow_since: '2025-09-16' diff --git a/inventory/group_vars/adjutant_all/source_git.yml b/inventory/group_vars/adjutant_all/source_git.yml index 36cb149dcc..2dfd87b380 100644 --- a/inventory/group_vars/adjutant_all/source_git.yml +++ b/inventory/group_vars/adjutant_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.07.2024 ### +### HEAD as of 29.09.2025 ### ## Adjutant service adjutant_git_repo: "{{ openstack_opendev_base_url }}/openstack/adjutant" -adjutant_git_install_branch: b8c1194f908fe2c2c9c497864ffb8025829d5ce0 +adjutant_git_install_branch: b50ec71c235be28c1dba40041d37bbae0fc6eaff adjutant_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/all/source_git.yml b/inventory/group_vars/all/source_git.yml index 821954050f..e95379ee65 100644 --- a/inventory/group_vars/all/source_git.yml +++ b/inventory/group_vars/all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 24.06.2025 ### +### HEAD as of 29.09.2025 ### ## Global Requirements requirements_git_repo: "{{ openstack_opendev_base_url }}/openstack/requirements" -requirements_git_install_branch: 79853815570c7527b0d48e8de741228fab924e68 +requirements_git_install_branch: 2c31269cffe9d6e5414822882d6158934df536ee requirements_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/blazar_all/source_git.yml b/inventory/group_vars/blazar_all/source_git.yml index 46ca3f471f..592364a275 100644 --- a/inventory/group_vars/blazar_all/source_git.yml +++ b/inventory/group_vars/blazar_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.05.2025 ### +### HEAD as of 29.09.2025 ### ## Blazar service blazar_git_repo: "{{ openstack_opendev_base_url }}/openstack/blazar" -blazar_git_install_branch: c05c4fa3fd09951dd8be46ae33dd21b1bbf528b9 +blazar_git_install_branch: 2484089d96d055f3ab89d46bc7221478e0d4fc65 blazar_git_track_branch: stable/2024.2 ## Blazar Nova Service diff --git a/inventory/group_vars/ceilometer_all/source_git.yml b/inventory/group_vars/ceilometer_all/source_git.yml index a3e881637a..cc58e01cd8 100644 --- a/inventory/group_vars/ceilometer_all/source_git.yml +++ b/inventory/group_vars/ceilometer_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 30.09.2024 ### +### HEAD as of 29.09.2025 ### ## Ceilometer service ceilometer_git_repo: "{{ openstack_opendev_base_url }}/openstack/ceilometer" -ceilometer_git_install_branch: a36cc766ca7366ce09bd41f32c81b9f28c6e3675 +ceilometer_git_install_branch: c99c0c9f6d491b0bf103705221bc6cdafadfb395 ceilometer_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/cinder_all/source_git.yml b/inventory/group_vars/cinder_all/source_git.yml index 89b6ce9640..71982954eb 100644 --- a/inventory/group_vars/cinder_all/source_git.yml +++ b/inventory/group_vars/cinder_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.05.2025 ### +### HEAD as of 29.09.2025 ### ## Cinder service cinder_git_repo: "{{ openstack_opendev_base_url }}/openstack/cinder" -cinder_git_install_branch: 7279ad6b80e20a5aa4b4fa1ad6b90ad366e63a5d +cinder_git_install_branch: e96dcc4e9744833ccea2697c67198f55aba3ad22 cinder_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/cloudkitty_all/source_git.yml b/inventory/group_vars/cloudkitty_all/source_git.yml index e440829a06..497589e9ef 100644 --- a/inventory/group_vars/cloudkitty_all/source_git.yml +++ b/inventory/group_vars/cloudkitty_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.11.2024 ### +### HEAD as of 29.09.2025 ### ## Cloudkitty service cloudkitty_git_repo: "{{ openstack_opendev_base_url }}/openstack/cloudkitty" -cloudkitty_git_install_branch: 82b0d01fae653f2f702d3be49a2dce01b69f89a0 +cloudkitty_git_install_branch: b7a4be00afa6a6dc202abadde31021164e610304 cloudkitty_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/heat_all/source_git.yml b/inventory/group_vars/heat_all/source_git.yml index 85059bd557..683cb74721 100644 --- a/inventory/group_vars/heat_all/source_git.yml +++ b/inventory/group_vars/heat_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.11.2024 ### +### HEAD as of 29.09.2025 ### ## Heat service heat_git_repo: "{{ openstack_opendev_base_url }}/openstack/heat" -heat_git_install_branch: 64bdbb9bc66c38760989dd7bb2574ccc14069872 +heat_git_install_branch: 42e32fa52b4736994176e0c30128f4a5dc7330fb heat_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/horizon_all/source_git.yml b/inventory/group_vars/horizon_all/source_git.yml index 5e2d4b59ec..0ed206c44e 100644 --- a/inventory/group_vars/horizon_all/source_git.yml +++ b/inventory/group_vars/horizon_all/source_git.yml @@ -13,16 +13,16 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 24.06.2025 ### +### HEAD as of 29.09.2025 ### ## Horizon service horizon_git_repo: "{{ openstack_opendev_base_url }}/openstack/horizon" -horizon_git_install_branch: 1d88ebef7535ea45901f8eb3448eee88956d6bbc +horizon_git_install_branch: f83e6f86cbdd0bd198c376a748537d684e21a860 horizon_git_track_branch: stable/2024.2 ## Adjutant dashboard plugin adjutant_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/adjutant-ui" -adjutant_dashboard_git_install_branch: bab31ad14dbf75019abf3132363910614865b23e +adjutant_dashboard_git_install_branch: c41568a2617316e1b2af98b039d26d0c2e1e642f adjutant_dashboard_git_track_branch: stable/2024.2 ## Barbican dashboard plugin @@ -77,5 +77,5 @@ neutron_vpnaas_dashboard_git_track_branch: stable/2024.2 ## Horizon Neutron FWaaS dashboard plugin neutron_fwaas_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-fwaas-dashboard" -neutron_fwaas_dashboard_git_install_branch: 94a00c572853b17999d0b4478d98b76eaa3864c8 +neutron_fwaas_dashboard_git_install_branch: 098fd216a10465d5144c58d3063285d14839d2a0 neutron_fwaas_dashboard_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/magnum_all/source_git.yml b/inventory/group_vars/magnum_all/source_git.yml index 50fb728fd9..c0d1b05601 100644 --- a/inventory/group_vars/magnum_all/source_git.yml +++ b/inventory/group_vars/magnum_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 10.01.2025 ### +### HEAD as of 29.09.2025 ### ## Magnum service magnum_git_repo: "{{ openstack_opendev_base_url }}/openstack/magnum" -magnum_git_install_branch: db197e08a09da93062fc4222180051dadfc0f0d8 +magnum_git_install_branch: b8a351b99b40c0aa123be3d51a4d0b73e66aa2dc magnum_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/manila_all/source_git.yml b/inventory/group_vars/manila_all/source_git.yml index 3ac99a4338..fb968e574c 100644 --- a/inventory/group_vars/manila_all/source_git.yml +++ b/inventory/group_vars/manila_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 08.05.2025 ### +### HEAD as of 29.09.2025 ### ## Manila service manila_git_repo: "{{ openstack_opendev_base_url }}/openstack/manila" -manila_git_install_branch: ba013661c87967488115dc671af98b76f034d6fa +manila_git_install_branch: ec38da0ecc72e8f7d4cb2fd9381f6f602279cfbd manila_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/mistral_all/source_git.yml b/inventory/group_vars/mistral_all/source_git.yml index 75cb7503d6..db0e4ba887 100644 --- a/inventory/group_vars/mistral_all/source_git.yml +++ b/inventory/group_vars/mistral_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 08.05.2025 ### +### HEAD as of 29.09.2025 ### ## Mistral service mistral_git_repo: "{{ openstack_opendev_base_url }}/openstack/mistral" -mistral_git_install_branch: cfc1b44046c242ad3679a60cc2abeb00f02e6658 +mistral_git_install_branch: cc997d3b3b3b5274104c79f22e006e9bfa04be4f mistral_git_track_branch: stable/2024.2 mistral_extra_git_repo: "{{ openstack_opendev_base_url }}/openstack/mistral-extra" diff --git a/inventory/group_vars/neutron_all/source_git.yml b/inventory/group_vars/neutron_all/source_git.yml index be379f9308..8a13ee0b9b 100644 --- a/inventory/group_vars/neutron_all/source_git.yml +++ b/inventory/group_vars/neutron_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 24.06.2025 ### +### HEAD as of 29.09.2025 ### ## Neutron service neutron_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron" -neutron_git_install_branch: 2753d8c86ffa408a19a3d9f7a2aac3ef1582006d +neutron_git_install_branch: 41b9dfa5d187cebce4cfed60a079d44edf551495 neutron_git_track_branch: stable/2024.2 neutron_vpnaas_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-vpnaas" @@ -41,7 +41,7 @@ networking_sfc_git_install_branch: 2e64dc0f7f9893c83d30878b95df6edca4d25cb9 networking_sfc_git_track_branch: stable/2024.2 networking_generic_switch_git_repo: "{{ openstack_opendev_base_url}}/openstack/networking-generic-switch" -networking_generic_switch_git_install_branch: 58e5d5039e6bddaad5e8a1802d44aec92b71f14f +networking_generic_switch_git_install_branch: a6ad4a1a031a4ef9c5bb7f824f2414459dab2d5d networking_generic_switch_git_track_branch: stable/2024.2 networking_nsx_git_repo: "{{ openstack_opendev_base_url }}/x/vmware-nsx" diff --git a/inventory/group_vars/nova_all/source_git.yml b/inventory/group_vars/nova_all/source_git.yml index 9d32e6250f..8284cd8600 100644 --- a/inventory/group_vars/nova_all/source_git.yml +++ b/inventory/group_vars/nova_all/source_git.yml @@ -23,11 +23,11 @@ ## * All items with this file should be separated by `name_` note that the name of the ## package should be one long name with no additional `_` separating it. -### HEAD as of 24.06.2025 ### +### HEAD as of 29.09.2025 ### ## NOVNC from source novncproxy_git_repo: "{{ openstack_github_base_url }}/novnc/noVNC" -novncproxy_git_install_branch: 4cb5aa45ae559f8fa85fe2b424abbc6ef6d4c6f9 +novncproxy_git_install_branch: 44b7489e730bcf7128fe7a2b2840f0b8f0bbfe9e novncproxy_git_track_branch: master ## spice-html5 from source @@ -37,5 +37,5 @@ spicehtml5_git_track_branch: master ## Nova service nova_git_repo: "{{ openstack_opendev_base_url }}/openstack/nova" -nova_git_install_branch: 88e49dd65c58536ba8dd39ab7cfde669a433f3f6 +nova_git_install_branch: 40cfbd646bf6d1e1a6789d9bde36167ae055ef87 nova_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/octavia_all/source_git.yml b/inventory/group_vars/octavia_all/source_git.yml index 175644c54e..eee8f1f3e6 100644 --- a/inventory/group_vars/octavia_all/source_git.yml +++ b/inventory/group_vars/octavia_all/source_git.yml @@ -13,14 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 08.05.2025 ### +### HEAD as of 29.09.2025 ### ## Octavia service octavia_git_repo: "{{ openstack_opendev_base_url }}/openstack/octavia" -octavia_git_install_branch: 8e02055af0e0c8840076a3b76cbf1c254882ed44 +octavia_git_install_branch: ccafae01828bef0d6f6635d559366ed48822baf5 octavia_git_track_branch: stable/2024.2 ## Octavia OVN provider octavia_ovn_octavia_provider_git_repo: "{{ openstack_opendev_base_url }}/openstack/ovn-octavia-provider" -octavia_ovn_octavia_provider_git_install_branch: a101619646c6dd792d10042100a78e4f2e13a3af +octavia_ovn_octavia_provider_git_install_branch: f86ecc7fb90db851dcece49344e22590e0807f89 octavia_ovn_octavia_provider_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/swift_all/source_git.yml b/inventory/group_vars/swift_all/source_git.yml index d9f02ccb5f..097446f9f0 100644 --- a/inventory/group_vars/swift_all/source_git.yml +++ b/inventory/group_vars/swift_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 10.01.2025 ### +### HEAD as of 29.09.2025 ### ## Swift service swift_git_repo: "{{ openstack_opendev_base_url }}/openstack/swift" -swift_git_install_branch: 1534385bcc10de4aaa7aa2762bf9e7961bb2ef17 +swift_git_install_branch: 9439a6257b1acce192d9a6ebb92ba65d637ddd34 swift_git_track_branch: stable/2024.2 From 3adcf029da473ce0861d86dac9e87a0f8e74c799 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Thu, 23 Oct 2025 19:05:26 +0200 Subject: [PATCH 20/24] Ensure that gluster mount is started after service At the moment there is a race condition possible on repo container startup, when glusterd.service is started later then var-www-repo.mount attempts to. This leads to a mount failure and requires a manual intervention after each controller restart. We use BindsTo together with After to ensure that mount will be started only when glusterd.service reaches Active state. A related fix [1] was proposed a while ago, stating that glusterd.service is started before network-online.target, which is not a case, as glusterd also starts after network-online.target [1] https://review.opendev.org/c/openstack/openstack-ansible-plugins/+/845987 Related-Bug: #2104382 Change-Id: I19c95e48eafbecbb8a6bc8bc7b2bf2e7d6b09333 Signed-off-by: Dmitriy Rabotyagov (cherry picked from commit 353470953898939a0166984ac7b434ca4da6a654) --- inventory/group_vars/repo_all.yml | 6 ++++++ .../notes/gluster_mount_wait_service-9d7f6f8850cce6d2.yaml | 6 ++++++ 2 files changed, 12 insertions(+) create mode 100644 releasenotes/notes/gluster_mount_wait_service-9d7f6f8850cce6d2.yaml diff --git a/inventory/group_vars/repo_all.yml b/inventory/group_vars/repo_all.yml index 3a574626fd..b2931a629a 100644 --- a/inventory/group_vars/repo_all.yml +++ b/inventory/group_vars/repo_all.yml @@ -28,6 +28,12 @@ repo_server_systemd_mounts: type: glusterfs state: 'started' enabled: true + config_overrides: + Unit: + BindsTo: glusterd.service + After: + ? glusterd.service + ? network-online.target openstack_repo_server_enable_glusterfs: True diff --git a/releasenotes/notes/gluster_mount_wait_service-9d7f6f8850cce6d2.yaml b/releasenotes/notes/gluster_mount_wait_service-9d7f6f8850cce6d2.yaml new file mode 100644 index 0000000000..9ee7547e59 --- /dev/null +++ b/releasenotes/notes/gluster_mount_wait_service-9d7f6f8850cce6d2.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixed a race condition on start of the repo container, when + var-www-mount.repo is started before glusterd.service is fully + operational. From 7b1969aabf31554138863fa197028f00beb7c348 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Thu, 6 Nov 2025 15:59:55 +0100 Subject: [PATCH 21/24] Bump SHAs for 2024.2 Change-Id: I2c81e2147378e50cf681f91958d532c410ea3789 Signed-off-by: Dmitriy Rabotyagov --- ansible-role-requirements.yml | 12 ++++++------ inventory/group_vars/cinder_all/source_git.yml | 4 ++-- inventory/group_vars/horizon_all/source_git.yml | 4 ++-- inventory/group_vars/ironic_all/source_git.yml | 4 ++-- inventory/group_vars/keystone_all/source_git.yml | 4 ++-- inventory/group_vars/manila_all/source_git.yml | 4 ++-- inventory/group_vars/neutron_all/source_git.yml | 8 ++++---- inventory/group_vars/nova_all/source_git.yml | 4 ++-- inventory/group_vars/octavia_all/source_git.yml | 6 +++--- inventory/group_vars/skyline_all/source_git.yml | 4 ++-- inventory/group_vars/swift_all/source_git.yml | 4 ++-- .../notes/ossa-2025-002-78a99472c2d04272.yaml | 4 ++++ .../notes/ovn_bgp_git_track-51f2f484516aad31.yaml | 10 ++++++++++ 13 files changed, 43 insertions(+), 29 deletions(-) create mode 100644 releasenotes/notes/ossa-2025-002-78a99472c2d04272.yaml create mode 100644 releasenotes/notes/ovn_bgp_git_track-51f2f484516aad31.yaml diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index e388d7a2bf..edafd0b329 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -194,9 +194,9 @@ - name: os_keystone scm: git src: https://opendev.org/openstack/openstack-ansible-os_keystone - version: 9d9509103f13994c8e6328438d1b6c623ee4caab + version: ba3b26280e25b70f68c3763d0feeeddbf3161874 trackbranch: stable/2024.2 - shallow_since: '2024-11-27' + shallow_since: '2025-09-13' - name: os_magnum scm: git src: https://opendev.org/openstack/openstack-ansible-os_magnum @@ -224,9 +224,9 @@ - name: os_neutron scm: git src: https://opendev.org/openstack/openstack-ansible-os_neutron - version: 0a05da9f95e6efb195d6b1f0e3dfa0e64a2a7ff1 + version: f8e8ca37995492e84884f065ed5f84fe0197f3f4 trackbranch: stable/2024.2 - shallow_since: '2025-05-15' + shallow_since: '2025-11-05' - name: os_nova scm: git src: https://opendev.org/openstack/openstack-ansible-os_nova @@ -236,9 +236,9 @@ - name: os_octavia scm: git src: https://opendev.org/openstack/openstack-ansible-os_octavia - version: 8a340b572b718a8cf02949cc33859ffbd3634f39 + version: ec92a438a5a8607c856ba0a2deb23f69e91d8ff8 trackbranch: stable/2024.2 - shallow_since: '2025-02-04' + shallow_since: '2025-08-29' - name: os_placement scm: git src: https://opendev.org/openstack/openstack-ansible-os_placement diff --git a/inventory/group_vars/cinder_all/source_git.yml b/inventory/group_vars/cinder_all/source_git.yml index 71982954eb..7b67bd47eb 100644 --- a/inventory/group_vars/cinder_all/source_git.yml +++ b/inventory/group_vars/cinder_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 29.09.2025 ### +### HEAD as of 06.11.2025 ### ## Cinder service cinder_git_repo: "{{ openstack_opendev_base_url }}/openstack/cinder" -cinder_git_install_branch: e96dcc4e9744833ccea2697c67198f55aba3ad22 +cinder_git_install_branch: a54ed55cfbf1b38b09985058ccfa46a237d0ffd6 cinder_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/horizon_all/source_git.yml b/inventory/group_vars/horizon_all/source_git.yml index 0ed206c44e..b8e5587e9e 100644 --- a/inventory/group_vars/horizon_all/source_git.yml +++ b/inventory/group_vars/horizon_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 29.09.2025 ### +### HEAD as of 06.11.2025 ### ## Horizon service horizon_git_repo: "{{ openstack_opendev_base_url }}/openstack/horizon" -horizon_git_install_branch: f83e6f86cbdd0bd198c376a748537d684e21a860 +horizon_git_install_branch: 6d9fbae3960e319b86d3ea2ddbc1c9e20be4ada6 horizon_git_track_branch: stable/2024.2 ## Adjutant dashboard plugin diff --git a/inventory/group_vars/ironic_all/source_git.yml b/inventory/group_vars/ironic_all/source_git.yml index 854fee84f5..7bf6c13631 100644 --- a/inventory/group_vars/ironic_all/source_git.yml +++ b/inventory/group_vars/ironic_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 24.06.2025 ### +### HEAD as of 06.11.2025 ### ## Ironic service ironic_git_repo: "{{ openstack_opendev_base_url }}/openstack/ironic" -ironic_git_install_branch: 1fb5bba81ee4a8a6f05119fd7aefc3b47f40b94b +ironic_git_install_branch: a54c628f7b3cc90f9eb0f9f7e179b537aa348fb7 ironic_git_track_branch: stable/2024.2 ## Ironic inspector service diff --git a/inventory/group_vars/keystone_all/source_git.yml b/inventory/group_vars/keystone_all/source_git.yml index 1f63e7558d..b1c1ed4d99 100644 --- a/inventory/group_vars/keystone_all/source_git.yml +++ b/inventory/group_vars/keystone_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.11.2024 ### +### HEAD as of 06.11.2025 ### ## Keystone service keystone_git_repo: "{{ openstack_opendev_base_url }}/openstack/keystone" -keystone_git_install_branch: 47891f4ae8fd7876e5a7657f58c32c371feeddc3 +keystone_git_install_branch: aea59e3117db10a3463dfcbac2caa7faa29dfccf keystone_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/manila_all/source_git.yml b/inventory/group_vars/manila_all/source_git.yml index fb968e574c..d22e6af2c7 100644 --- a/inventory/group_vars/manila_all/source_git.yml +++ b/inventory/group_vars/manila_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 29.09.2025 ### +### HEAD as of 06.11.2025 ### ## Manila service manila_git_repo: "{{ openstack_opendev_base_url }}/openstack/manila" -manila_git_install_branch: ec38da0ecc72e8f7d4cb2fd9381f6f602279cfbd +manila_git_install_branch: 338bcb77f8d36c422e616e0349b7bbf297c63c3a manila_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/neutron_all/source_git.yml b/inventory/group_vars/neutron_all/source_git.yml index 8a13ee0b9b..ea728d2a3f 100644 --- a/inventory/group_vars/neutron_all/source_git.yml +++ b/inventory/group_vars/neutron_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 29.09.2025 ### +### HEAD as of 06.11.2025 ### ## Neutron service neutron_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron" -neutron_git_install_branch: 41b9dfa5d187cebce4cfed60a079d44edf551495 +neutron_git_install_branch: 928c1af67849184a073a39c95f30de854a7e93c8 neutron_git_track_branch: stable/2024.2 neutron_vpnaas_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-vpnaas" @@ -49,7 +49,7 @@ networking_nsx_git_install_branch: 715cb5fc1174b9226f043e49ffd389add44f070a networking_nsx_git_track_branch: master networking_nsxlib_git_repo: "{{ openstack_opendev_base_url }}/x/vmware-nsxlib" -networking_nsxlib_git_install_branch: b49988f87a9fedb7e79041359a2bc7df1bf170e5 +networking_nsxlib_git_install_branch: 948a72da034acdd74a08eded88aa19b080e40927 networking_nsxlib_git_track_branch: master networking_baremetal_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-baremetal" @@ -57,5 +57,5 @@ networking_baremetal_git_install_branch: 1fba63ce21619d3fe70117c6679e53629c612bc networking_baremetal_git_track_branch: stable/2024.2 networking_ovn_bgp_git_repo: "{{ openstack_opendev_base_url }}/openstack/ovn-bgp-agent" -networking_ovn_bgp_git_install_branch: 704742076a28c13b811ea37e71dae1e4b0aca573 +networking_ovn_bgp_git_install_branch: ace144ccfb08001ace88b26f7634e1d914e396d2 networking_ovn_bgp_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/nova_all/source_git.yml b/inventory/group_vars/nova_all/source_git.yml index 8284cd8600..986182e776 100644 --- a/inventory/group_vars/nova_all/source_git.yml +++ b/inventory/group_vars/nova_all/source_git.yml @@ -23,11 +23,11 @@ ## * All items with this file should be separated by `name_` note that the name of the ## package should be one long name with no additional `_` separating it. -### HEAD as of 29.09.2025 ### +### HEAD as of 06.11.2025 ### ## NOVNC from source novncproxy_git_repo: "{{ openstack_github_base_url }}/novnc/noVNC" -novncproxy_git_install_branch: 44b7489e730bcf7128fe7a2b2840f0b8f0bbfe9e +novncproxy_git_install_branch: d44f7e04fc456844836c7c5ac911d0f4e8dd06e6 novncproxy_git_track_branch: master ## spice-html5 from source diff --git a/inventory/group_vars/octavia_all/source_git.yml b/inventory/group_vars/octavia_all/source_git.yml index eee8f1f3e6..2d0ca1592f 100644 --- a/inventory/group_vars/octavia_all/source_git.yml +++ b/inventory/group_vars/octavia_all/source_git.yml @@ -13,14 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 29.09.2025 ### +### HEAD as of 06.11.2025 ### ## Octavia service octavia_git_repo: "{{ openstack_opendev_base_url }}/openstack/octavia" -octavia_git_install_branch: ccafae01828bef0d6f6635d559366ed48822baf5 +octavia_git_install_branch: a2c29c49c0bfe34b400f60e09993aa6a321ed559 octavia_git_track_branch: stable/2024.2 ## Octavia OVN provider octavia_ovn_octavia_provider_git_repo: "{{ openstack_opendev_base_url }}/openstack/ovn-octavia-provider" -octavia_ovn_octavia_provider_git_install_branch: f86ecc7fb90db851dcece49344e22590e0807f89 +octavia_ovn_octavia_provider_git_install_branch: d3ef56db6838bd427233681334637412067f00f7 octavia_ovn_octavia_provider_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/skyline_all/source_git.yml b/inventory/group_vars/skyline_all/source_git.yml index 579613b20c..02f1a11ff2 100644 --- a/inventory/group_vars/skyline_all/source_git.yml +++ b/inventory/group_vars/skyline_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.11.2024 ### +### HEAD as of 06.11.2025 ### ## Skyline service skyline_git_repo: "{{ openstack_opendev_base_url }}/openstack/skyline-apiserver" -skyline_git_install_branch: c8bf698666044bc05b92ddde7dc780fe90c1b538 +skyline_git_install_branch: 0e891e9299889814a585ec22807d8cb59c88797a skyline_git_track_branch: stable/2024.2 skyline_console_git_repo: "{{ openstack_opendev_base_url }}/openstack/skyline-console" diff --git a/inventory/group_vars/swift_all/source_git.yml b/inventory/group_vars/swift_all/source_git.yml index 097446f9f0..476646dc38 100644 --- a/inventory/group_vars/swift_all/source_git.yml +++ b/inventory/group_vars/swift_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 29.09.2025 ### +### HEAD as of 06.11.2025 ### ## Swift service swift_git_repo: "{{ openstack_opendev_base_url }}/openstack/swift" -swift_git_install_branch: 9439a6257b1acce192d9a6ebb92ba65d637ddd34 +swift_git_install_branch: 9d495089a7aa6c5b222037bc699075d3c3005fa4 swift_git_track_branch: stable/2024.2 diff --git a/releasenotes/notes/ossa-2025-002-78a99472c2d04272.yaml b/releasenotes/notes/ossa-2025-002-78a99472c2d04272.yaml new file mode 100644 index 0000000000..6497e9ea59 --- /dev/null +++ b/releasenotes/notes/ossa-2025-002-78a99472c2d04272.yaml @@ -0,0 +1,4 @@ +--- +security: + - | + Includes patched versions of Keystone and Swift for `OSSA-2025-002 `_ diff --git a/releasenotes/notes/ovn_bgp_git_track-51f2f484516aad31.yaml b/releasenotes/notes/ovn_bgp_git_track-51f2f484516aad31.yaml new file mode 100644 index 0000000000..d134ffc83a --- /dev/null +++ b/releasenotes/notes/ovn_bgp_git_track-51f2f484516aad31.yaml @@ -0,0 +1,10 @@ +--- +upgrade: + - | + Variable ``networking_ovn_bgp_install_branch`` has been renamed to + ``networking_ovn_bgp_git_install_branch`` in order to match existing + naming convention. +fixes: + - | + Fixes SHA pinning and installation of ``ovn-bgp-agent``, as SHA pinning + and role were using different variable names. From 3073119cf39d886d7368bdb152a6ff512ce2b5fc Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Tue, 25 Nov 2025 17:00:51 +0100 Subject: [PATCH 22/24] Bump SHAs for 2024.2 Change-Id: If32b0ea5123c3f5ef999e3d86aa0bf3680846507 Signed-off-by: Dmitriy Rabotyagov --- ansible-role-requirements.yml | 4 ++-- inventory/group_vars/heat_all/source_git.yml | 4 ++-- inventory/group_vars/horizon_all/source_git.yml | 4 ++-- inventory/group_vars/ironic_all/source_git.yml | 4 ++-- inventory/group_vars/keystone_all/source_git.yml | 4 ++-- inventory/group_vars/neutron_all/source_git.yml | 6 +++--- inventory/group_vars/nova_all/source_git.yml | 4 ++-- inventory/group_vars/octavia_all/source_git.yml | 4 ++-- releasenotes/notes/dep_repo_change-bfbb23a12ffb0fb4.yaml | 5 +++++ 9 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 releasenotes/notes/dep_repo_change-bfbb23a12ffb0fb4.yaml diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index edafd0b329..11d0c820cc 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -290,9 +290,9 @@ - name: rabbitmq_server scm: git src: https://opendev.org/openstack/openstack-ansible-rabbitmq_server - version: e5ca2ec50570a0d28edaa37bdcd2fe4f54f32c40 + version: 8113093accff8337d131216d1f0d60de13a26a3e trackbranch: stable/2024.2 - shallow_since: '2025-03-02' + shallow_since: '2025-11-19' - name: repo_server scm: git src: https://opendev.org/openstack/openstack-ansible-repo_server diff --git a/inventory/group_vars/heat_all/source_git.yml b/inventory/group_vars/heat_all/source_git.yml index 683cb74721..2fdff704b2 100644 --- a/inventory/group_vars/heat_all/source_git.yml +++ b/inventory/group_vars/heat_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 29.09.2025 ### +### HEAD as of 25.11.2025 ### ## Heat service heat_git_repo: "{{ openstack_opendev_base_url }}/openstack/heat" -heat_git_install_branch: 42e32fa52b4736994176e0c30128f4a5dc7330fb +heat_git_install_branch: 50c081b7a5747c3c76e10f77790a159860d977e6 heat_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/horizon_all/source_git.yml b/inventory/group_vars/horizon_all/source_git.yml index b8e5587e9e..2a7425a04d 100644 --- a/inventory/group_vars/horizon_all/source_git.yml +++ b/inventory/group_vars/horizon_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 06.11.2025 ### +### HEAD as of 25.11.2025 ### ## Horizon service horizon_git_repo: "{{ openstack_opendev_base_url }}/openstack/horizon" -horizon_git_install_branch: 6d9fbae3960e319b86d3ea2ddbc1c9e20be4ada6 +horizon_git_install_branch: 118b7702943707af569a9f5804c6f60c1090e859 horizon_git_track_branch: stable/2024.2 ## Adjutant dashboard plugin diff --git a/inventory/group_vars/ironic_all/source_git.yml b/inventory/group_vars/ironic_all/source_git.yml index 7bf6c13631..9983c690f6 100644 --- a/inventory/group_vars/ironic_all/source_git.yml +++ b/inventory/group_vars/ironic_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 06.11.2025 ### +### HEAD as of 25.11.2025 ### ## Ironic service ironic_git_repo: "{{ openstack_opendev_base_url }}/openstack/ironic" -ironic_git_install_branch: a54c628f7b3cc90f9eb0f9f7e179b537aa348fb7 +ironic_git_install_branch: 38837d81b55a1ded34a53f8703c596bd951a5b19 ironic_git_track_branch: stable/2024.2 ## Ironic inspector service diff --git a/inventory/group_vars/keystone_all/source_git.yml b/inventory/group_vars/keystone_all/source_git.yml index b1c1ed4d99..1a9e65a7b2 100644 --- a/inventory/group_vars/keystone_all/source_git.yml +++ b/inventory/group_vars/keystone_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 06.11.2025 ### +### HEAD as of 25.11.2025 ### ## Keystone service keystone_git_repo: "{{ openstack_opendev_base_url }}/openstack/keystone" -keystone_git_install_branch: aea59e3117db10a3463dfcbac2caa7faa29dfccf +keystone_git_install_branch: f73299cd71633b6f462ad4f59c038b6ac9e62695 keystone_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/neutron_all/source_git.yml b/inventory/group_vars/neutron_all/source_git.yml index ea728d2a3f..8e878e48c3 100644 --- a/inventory/group_vars/neutron_all/source_git.yml +++ b/inventory/group_vars/neutron_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 06.11.2025 ### +### HEAD as of 25.11.2025 ### ## Neutron service neutron_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron" -neutron_git_install_branch: 928c1af67849184a073a39c95f30de854a7e93c8 +neutron_git_install_branch: e3894e4efbeac05da96a6a6cb7e5fc6593e56bb7 neutron_git_track_branch: stable/2024.2 neutron_vpnaas_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-vpnaas" @@ -57,5 +57,5 @@ networking_baremetal_git_install_branch: 1fba63ce21619d3fe70117c6679e53629c612bc networking_baremetal_git_track_branch: stable/2024.2 networking_ovn_bgp_git_repo: "{{ openstack_opendev_base_url }}/openstack/ovn-bgp-agent" -networking_ovn_bgp_git_install_branch: ace144ccfb08001ace88b26f7634e1d914e396d2 +networking_ovn_bgp_git_install_branch: 221a35eb448d280ae169824ff4fd4de1ebec89d5 networking_ovn_bgp_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/nova_all/source_git.yml b/inventory/group_vars/nova_all/source_git.yml index 986182e776..a344e8c61d 100644 --- a/inventory/group_vars/nova_all/source_git.yml +++ b/inventory/group_vars/nova_all/source_git.yml @@ -23,7 +23,7 @@ ## * All items with this file should be separated by `name_` note that the name of the ## package should be one long name with no additional `_` separating it. -### HEAD as of 06.11.2025 ### +### HEAD as of 25.11.2025 ### ## NOVNC from source novncproxy_git_repo: "{{ openstack_github_base_url }}/novnc/noVNC" @@ -37,5 +37,5 @@ spicehtml5_git_track_branch: master ## Nova service nova_git_repo: "{{ openstack_opendev_base_url }}/openstack/nova" -nova_git_install_branch: 40cfbd646bf6d1e1a6789d9bde36167ae055ef87 +nova_git_install_branch: 6e2926435e3328d5474a92a825dbf3b718e45ff8 nova_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/octavia_all/source_git.yml b/inventory/group_vars/octavia_all/source_git.yml index 2d0ca1592f..0be09a9dcf 100644 --- a/inventory/group_vars/octavia_all/source_git.yml +++ b/inventory/group_vars/octavia_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 06.11.2025 ### +### HEAD as of 25.11.2025 ### ## Octavia service octavia_git_repo: "{{ openstack_opendev_base_url }}/openstack/octavia" -octavia_git_install_branch: a2c29c49c0bfe34b400f60e09993aa6a321ed559 +octavia_git_install_branch: 577ff3d6712f0235b3fda3ae3f89ce1b5582d2a8 octavia_git_track_branch: stable/2024.2 ## Octavia OVN provider diff --git a/releasenotes/notes/dep_repo_change-bfbb23a12ffb0fb4.yaml b/releasenotes/notes/dep_repo_change-bfbb23a12ffb0fb4.yaml new file mode 100644 index 0000000000..8a251309f8 --- /dev/null +++ b/releasenotes/notes/dep_repo_change-bfbb23a12ffb0fb4.yaml @@ -0,0 +1,5 @@ +--- +other: + - | + Debian/Ubuntu Repository for RabbitMQ has changed from ppa1.rabbitmq.com + to deb1.rabbitmq.com and deb2.rabbitmq.com. From 00ce4cb22aa043536622ca71622412f618303d59 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Thu, 17 Apr 2025 21:31:25 +0200 Subject: [PATCH 23/24] Move sync framework to integrated repo With deprecation of tests repo we want to remain ability to sync files across all maintained projects. The best place for it is integrated repo in order to avoid any potential circular dependencies. Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-rabbitmq_server/+/972600 Change-Id: Ie32cce414ea726d724faa29d121ef82178444f61 Signed-off-by: Dmitriy Rabotyagov --- sync/doc/requirements.txt | 16 ++++++++ sync/gen-projects-list.sh | 78 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 sync/doc/requirements.txt create mode 100755 sync/gen-projects-list.sh diff --git a/sync/doc/requirements.txt b/sync/doc/requirements.txt new file mode 100644 index 0000000000..f177bdb0a2 --- /dev/null +++ b/sync/doc/requirements.txt @@ -0,0 +1,16 @@ +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. + +# WARNING: +# This file is maintained in the openstack-ansible-tests repository. +# https://opendev.org/openstack/openstack-ansible/src/branch/master/sync/doc/requirements.txt +# If you need to modify this file, update the one in the +# openstack-ansible-tests repository. Once it merges there, the changes will +# automatically be proposed to all the repositories which use it. + +sphinx>=2.0.0,!=2.1.0 # BSD +sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD +openstackdocstheme>=2.2.1 # Apache-2.0 +reno>=3.1.0 # Apache-2.0 +doc8>=0.6.0 # Apache-2.0 diff --git a/sync/gen-projects-list.sh b/sync/gen-projects-list.sh new file mode 100755 index 0000000000..fb8d276705 --- /dev/null +++ b/sync/gen-projects-list.sh @@ -0,0 +1,78 @@ +#!/bin/bash + +# Copyright 2017, SUSE LINUX GmbH. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Get list of all the maintained OpenStack Ansible projects + +# 'exclude_projects' variable should contain all the OSA projects +# listed in https://opendev.org/ but should be excluded +# from the generated list for various reasons (ie unmaintained, +# not applicable etc) + +# Do not leave empty lines since grep -F will not match anything + +set -e + +exclude_project() { + excluded_projects+="openstack/$1 " +} + +extra_include_project() { + extra_included_projects+="openstack/$1 " +} + +############## EXCLUDED PROJECTS ###################### +# +# List of the projects that need to be excluded for various +# reasons +# +# retired projects +exclude_project openstack-ansible-os_freezer +exclude_project openstack-ansible-os_swift_sync +exclude_project openstack-ansible-pip_lock_down +exclude_project openstack-ansible-py_from_git +exclude_project openstack-ansible-security +# integrated is where we are so we know it's maintained +exclude_project openstack-ansible +# +############## END OF EXCLUDED PROJECTS ############### + +############## INCLUDED PROJECTS ###################### +# +# List of additional projects that need to be included for various +# reasons +# +# ansible-hardening. Used by AIO in favor of the retired +# openstack-ansible-security +extra_include_project ansible-config_template +extra_include_project ansible-hardening +extra_include_project ansible-role-python_venv_build +extra_include_project ansible-role-systemd_mount +extra_include_project ansible-role-systemd_networkd +extra_include_project ansible-role-systemd_service +############## END OF INCLUDED PROJECTS ############### + +# Replace spaces with newlines as expected by grep -F +excluded_projects="$(echo ${excluded_projects} | tr ' ' '\n')" + +# The output should only contain a list of projects or an empty string. +# Anything else will probably make the CI bots to fail. + +ssh -p 29418 proposal-bot@review.opendev.org gerrit ls-projects --prefix openstack/openstack-ansible- | \ + grep -v -F "${excluded_projects}" | uniq | sort -n + +for x in ${extra_included_projects[@]}; do + echo $x +done From 4900fdc2de363e4308f0ba5f8b60edd5edc4e0ea Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Wed, 14 Jan 2026 15:05:59 +0100 Subject: [PATCH 24/24] Bump SHAs for 2024.2 Change-Id: I2c404be307fb128651938609cc5873c5cd3f18d5 Signed-off-by: Dmitriy Rabotyagov --- ansible-role-requirements.yml | 4 ++-- inventory/group_vars/cinder_all/source_git.yml | 4 ++-- inventory/group_vars/horizon_all/source_git.yml | 4 ++-- inventory/group_vars/ironic_all/source_git.yml | 4 ++-- inventory/group_vars/keystone_all/source_git.yml | 4 ++-- inventory/group_vars/neutron_all/source_git.yml | 4 ++-- inventory/group_vars/nova_all/source_git.yml | 6 +++--- inventory/group_vars/octavia_all/source_git.yml | 4 ++-- inventory/group_vars/placement_all/source_git.yml | 4 ++-- ...abbitmq_ensure_no_queue_mirroring-c032f6e169f09c2d.yaml | 7 +++++++ releasenotes/notes/rpm_gpg_url-ae026bf0b47b845c.yaml | 6 ++++++ 11 files changed, 32 insertions(+), 19 deletions(-) create mode 100644 releasenotes/notes/rabbitmq_ensure_no_queue_mirroring-c032f6e169f09c2d.yaml create mode 100644 releasenotes/notes/rpm_gpg_url-ae026bf0b47b845c.yaml diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index 11d0c820cc..45b2d5ef99 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -290,9 +290,9 @@ - name: rabbitmq_server scm: git src: https://opendev.org/openstack/openstack-ansible-rabbitmq_server - version: 8113093accff8337d131216d1f0d60de13a26a3e + version: e3c24fa37cd08bcc3cdad3f7045a265e478599be trackbranch: stable/2024.2 - shallow_since: '2025-11-19' + shallow_since: '2026-01-12' - name: repo_server scm: git src: https://opendev.org/openstack/openstack-ansible-repo_server diff --git a/inventory/group_vars/cinder_all/source_git.yml b/inventory/group_vars/cinder_all/source_git.yml index 7b67bd47eb..8b2772bfcc 100644 --- a/inventory/group_vars/cinder_all/source_git.yml +++ b/inventory/group_vars/cinder_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 06.11.2025 ### +### HEAD as of 14.01.2026 ### ## Cinder service cinder_git_repo: "{{ openstack_opendev_base_url }}/openstack/cinder" -cinder_git_install_branch: a54ed55cfbf1b38b09985058ccfa46a237d0ffd6 +cinder_git_install_branch: 7b390f1022a5ec176fe8774f642fbca499127d1a cinder_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/horizon_all/source_git.yml b/inventory/group_vars/horizon_all/source_git.yml index 2a7425a04d..6ee5337811 100644 --- a/inventory/group_vars/horizon_all/source_git.yml +++ b/inventory/group_vars/horizon_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 25.11.2025 ### +### HEAD as of 14.01.2026 ### ## Horizon service horizon_git_repo: "{{ openstack_opendev_base_url }}/openstack/horizon" -horizon_git_install_branch: 118b7702943707af569a9f5804c6f60c1090e859 +horizon_git_install_branch: fdaaf6e1a1708deeb6b7a24ab0961e2480337e1c horizon_git_track_branch: stable/2024.2 ## Adjutant dashboard plugin diff --git a/inventory/group_vars/ironic_all/source_git.yml b/inventory/group_vars/ironic_all/source_git.yml index 9983c690f6..7701c1d15d 100644 --- a/inventory/group_vars/ironic_all/source_git.yml +++ b/inventory/group_vars/ironic_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 25.11.2025 ### +### HEAD as of 14.01.2026 ### ## Ironic service ironic_git_repo: "{{ openstack_opendev_base_url }}/openstack/ironic" -ironic_git_install_branch: 38837d81b55a1ded34a53f8703c596bd951a5b19 +ironic_git_install_branch: 428cc528cc7b288d3376ff0d5048b9a90ee8cca8 ironic_git_track_branch: stable/2024.2 ## Ironic inspector service diff --git a/inventory/group_vars/keystone_all/source_git.yml b/inventory/group_vars/keystone_all/source_git.yml index 1a9e65a7b2..578d8808f2 100644 --- a/inventory/group_vars/keystone_all/source_git.yml +++ b/inventory/group_vars/keystone_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 25.11.2025 ### +### HEAD as of 14.01.2026 ### ## Keystone service keystone_git_repo: "{{ openstack_opendev_base_url }}/openstack/keystone" -keystone_git_install_branch: f73299cd71633b6f462ad4f59c038b6ac9e62695 +keystone_git_install_branch: 489e170f8161dac7c8388a9bd5864078a1338cc9 keystone_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/neutron_all/source_git.yml b/inventory/group_vars/neutron_all/source_git.yml index 8e878e48c3..7f46c2c94c 100644 --- a/inventory/group_vars/neutron_all/source_git.yml +++ b/inventory/group_vars/neutron_all/source_git.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 25.11.2025 ### +### HEAD as of 14.01.2026 ### ## Neutron service neutron_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron" -neutron_git_install_branch: e3894e4efbeac05da96a6a6cb7e5fc6593e56bb7 +neutron_git_install_branch: 796278e55567d7226188735af99e49243daf9260 neutron_git_track_branch: stable/2024.2 neutron_vpnaas_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-vpnaas" diff --git a/inventory/group_vars/nova_all/source_git.yml b/inventory/group_vars/nova_all/source_git.yml index a344e8c61d..e924b306d2 100644 --- a/inventory/group_vars/nova_all/source_git.yml +++ b/inventory/group_vars/nova_all/source_git.yml @@ -23,11 +23,11 @@ ## * All items with this file should be separated by `name_` note that the name of the ## package should be one long name with no additional `_` separating it. -### HEAD as of 25.11.2025 ### +### HEAD as of 14.01.2026 ### ## NOVNC from source novncproxy_git_repo: "{{ openstack_github_base_url }}/novnc/noVNC" -novncproxy_git_install_branch: d44f7e04fc456844836c7c5ac911d0f4e8dd06e6 +novncproxy_git_install_branch: 6d0a9746657b085c11309dc5356083fcbb018526 novncproxy_git_track_branch: master ## spice-html5 from source @@ -37,5 +37,5 @@ spicehtml5_git_track_branch: master ## Nova service nova_git_repo: "{{ openstack_opendev_base_url }}/openstack/nova" -nova_git_install_branch: 6e2926435e3328d5474a92a825dbf3b718e45ff8 +nova_git_install_branch: 19df809bb4f8baf6739a2f7b16ae3b13c01efa93 nova_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/octavia_all/source_git.yml b/inventory/group_vars/octavia_all/source_git.yml index 0be09a9dcf..fdc674c44e 100644 --- a/inventory/group_vars/octavia_all/source_git.yml +++ b/inventory/group_vars/octavia_all/source_git.yml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 25.11.2025 ### +### HEAD as of 14.01.2026 ### ## Octavia service octavia_git_repo: "{{ openstack_opendev_base_url }}/openstack/octavia" @@ -22,5 +22,5 @@ octavia_git_track_branch: stable/2024.2 ## Octavia OVN provider octavia_ovn_octavia_provider_git_repo: "{{ openstack_opendev_base_url }}/openstack/ovn-octavia-provider" -octavia_ovn_octavia_provider_git_install_branch: d3ef56db6838bd427233681334637412067f00f7 +octavia_ovn_octavia_provider_git_install_branch: f673dc05ef46d46fb1ed10004a8535a63396c603 octavia_ovn_octavia_provider_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/placement_all/source_git.yml b/inventory/group_vars/placement_all/source_git.yml index 23b005aa70..8008241bc6 100644 --- a/inventory/group_vars/placement_all/source_git.yml +++ b/inventory/group_vars/placement_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.02.2025 ### +### HEAD as of 14.01.2026 ### ## Placement service placement_git_repo: "{{ openstack_opendev_base_url }}/openstack/placement" -placement_git_install_branch: 828b2559a1b3c0b59c543e851c6ea3efb1baae20 +placement_git_install_branch: 8345235b183c5fcf4dc5c9f7b075fd99168db022 placement_git_track_branch: stable/2024.2 diff --git a/releasenotes/notes/rabbitmq_ensure_no_queue_mirroring-c032f6e169f09c2d.yaml b/releasenotes/notes/rabbitmq_ensure_no_queue_mirroring-c032f6e169f09c2d.yaml new file mode 100644 index 0000000000..ca9f0db47c --- /dev/null +++ b/releasenotes/notes/rabbitmq_ensure_no_queue_mirroring-c032f6e169f09c2d.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + Fixed RabbitMQ upgrade issue for older deployments which had + previously used RabbitMQ Classic Queue mirroring (HA Queues) + by implementing an upgrade check and disabling leftover + policies on upgrade. diff --git a/releasenotes/notes/rpm_gpg_url-ae026bf0b47b845c.yaml b/releasenotes/notes/rpm_gpg_url-ae026bf0b47b845c.yaml new file mode 100644 index 0000000000..ac905fa453 --- /dev/null +++ b/releasenotes/notes/rpm_gpg_url-ae026bf0b47b845c.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + GPG key URLs for RabbitMQ and Erlang were updated to relevant ones + for RPM-based distributions. + This fixes RabbitMQ/Erlang installation for CentOS and Rocky Linux.