diff --git a/ansible-collection-requirements.yml b/ansible-collection-requirements.yml index 2bec90b831..5b51e3eb3c 100644 --- a/ansible-collection-requirements.yml +++ b/ansible-collection-requirements.yml @@ -7,7 +7,7 @@ collections: - name: openstack.config_template source: https://opendev.org/openstack/ansible-config_template type: git - version: 2.1.0 + version: 2.1.1 - name: openstack.osa source: https://opendev.org/openstack/openstack-ansible-plugins type: git @@ -15,7 +15,7 @@ collections: - name: community.general source: https://github.com/ansible-collections/community.general type: git - version: 9.1.0 + version: 9.3.0 - name: community.rabbitmq source: https://github.com/ansible-collections/community.rabbitmq type: git @@ -23,11 +23,11 @@ collections: - name: community.mysql source: https://github.com/ansible-collections/community.mysql type: git - version: 3.9.0 + version: 3.10.0 - name: community.crypto source: https://github.com/ansible-collections/community.crypto type: git - version: 2.20.0 + version: 2.21.1 - name: ansible.posix source: https://github.com/ansible-collections/ansible.posix type: git @@ -39,11 +39,11 @@ collections: - name: ansible.netcommon source: https://github.com/ansible-collections/ansible.netcommon type: git - version: v7.0.0 + version: v7.1.0 - name: ansible.utils source: https://github.com/ansible-collections/ansible.utils type: git - version: v5.0.0 + version: v5.1.0 - name: openvswitch.openvswitch source: https://github.com/ansible-collections/openvswitch.openvswitch type: git diff --git a/global-requirement-pins.txt b/global-requirement-pins.txt index eba64a9b98..855c34d9be 100644 --- a/global-requirement-pins.txt +++ b/global-requirement-pins.txt @@ -7,6 +7,6 @@ # pip==24.1 -wheel==0.43.0 -setuptools==70.1.0 -uWSGI==2.0.26 +wheel==0.44.0 +setuptools==75.1.0 +uWSGI==2.0.27 diff --git a/inventory/group_vars/adjutant_all/source_git.yml b/inventory/group_vars/adjutant_all/source_git.yml index f4c34e0486..36cb149dcc 100644 --- a/inventory/group_vars/adjutant_all/source_git.yml +++ b/inventory/group_vars/adjutant_all/source_git.yml @@ -18,4 +18,4 @@ ## Adjutant service adjutant_git_repo: "{{ openstack_opendev_base_url }}/openstack/adjutant" adjutant_git_install_branch: b8c1194f908fe2c2c9c497864ffb8025829d5ce0 -adjutant_git_track_branch: master +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 5d072f982d..d8c2fb4dc6 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.07.2024 ### +### HEAD as of 30.09.2024 ### ## Global Requirements requirements_git_repo: "{{ openstack_opendev_base_url }}/openstack/requirements" -requirements_git_install_branch: 939e4eea5738ce51571ca85fd97aa2b02474e92a -requirements_git_track_branch: master +requirements_git_install_branch: ca4a450bc5712e7e1472f3e0c56e1b453c587fe7 +requirements_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/aodh_all/source_git.yml b/inventory/group_vars/aodh_all/source_git.yml index 9fcce1acc1..fc96176531 100644 --- a/inventory/group_vars/aodh_all/source_git.yml +++ b/inventory/group_vars/aodh_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 05.07.2024 ### +### HEAD as of 30.09.2024 ### ## Aodh service aodh_git_repo: "{{ openstack_opendev_base_url }}/openstack/aodh" -aodh_git_install_branch: f43e90311724ad574ff46d0165ae7f30395b9aaf -aodh_git_track_branch: master +aodh_git_install_branch: faef3b0c7a84704c10d99754179989e656db5c53 +aodh_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/barbican_all/source_git.yml b/inventory/group_vars/barbican_all/source_git.yml index 3f44f776bc..3f0859d188 100644 --- a/inventory/group_vars/barbican_all/source_git.yml +++ b/inventory/group_vars/barbican_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 30.09.2024 ### ## Barbican service barbican_git_repo: "{{ openstack_opendev_base_url }}/openstack/barbican" -barbican_git_install_branch: f3f104079acc835572f11120b02b6bb35e842541 -barbican_git_track_branch: master +barbican_git_install_branch: ff73594d6705a84491e5a7aa7c184d8d14aa5232 +barbican_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 3f8863880d..f6281534a0 100644 --- a/inventory/group_vars/blazar_all/source_git.yml +++ b/inventory/group_vars/blazar_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 05.07.2024 ### +### HEAD as of 30.09.2024 ### ## Blazar service blazar_git_repo: "{{ openstack_opendev_base_url }}/openstack/blazar" -blazar_git_install_branch: b7d4b086242b133009721a6790e0fddce83f6a6c -blazar_git_track_branch: master +blazar_git_install_branch: 03630d9ffd3d0b585cb337400fe6c0c6facd9aac +blazar_git_track_branch: stable/2024.2 ## Blazar Nova Service blazar_nova_git_repo: "{{ openstack_opendev_base_url }}/openstack/blazar-nova" -blazar_nova_git_install_branch: 662957aa48b5538661b16ef39165699ba521997b -blazar_nova_git_track_branch: master +blazar_nova_git_install_branch: a55e35872f18c75da1b6270dd2eea52e8a76a7b8 +blazar_nova_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/ceilometer_all/source_git.yml b/inventory/group_vars/ceilometer_all/source_git.yml index 180c0b0fd8..a3e881637a 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 26.07.2024 ### +### HEAD as of 30.09.2024 ### ## Ceilometer service ceilometer_git_repo: "{{ openstack_opendev_base_url }}/openstack/ceilometer" -ceilometer_git_install_branch: 6c114aac7346ae5e0844915528b62a84ad64d885 -ceilometer_git_track_branch: master +ceilometer_git_install_branch: a36cc766ca7366ce09bd41f32c81b9f28c6e3675 +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 239140392c..bdb0cfd77b 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.07.2024 ### +### HEAD as of 30.09.2024 ### ## Cinder service cinder_git_repo: "{{ openstack_opendev_base_url }}/openstack/cinder" -cinder_git_install_branch: d2e1b64681eb8a386c8e62b6f31831a2514657d4 -cinder_git_track_branch: master +cinder_git_install_branch: 6ba70ec68493eaf7c17eea05aa33b4086423e0cd +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 a2b399ed36..63687d7a65 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 05.07.2024 ### +### HEAD as of 30.09.2024 ### ## Cloudkitty service cloudkitty_git_repo: "{{ openstack_opendev_base_url }}/openstack/cloudkitty" -cloudkitty_git_install_branch: 76850ca060117b0630fb2b6c0cb6f90f07f4c7bc -cloudkitty_git_track_branch: master +cloudkitty_git_install_branch: 0f9d990e43caff087c467e2c218006cefe968ac3 +cloudkitty_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 5241ce5487..75b71bbc4f 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.07.2024 ### +### HEAD as of 30.09.2024 ### ## Designate service designate_git_repo: "{{ openstack_opendev_base_url }}/openstack/designate" -designate_git_install_branch: b9466df8c2e98e2c0a93326cae6f2e77e26324aa -designate_git_track_branch: master +designate_git_install_branch: 1bb5504e52ad94ecc714bf3ac614a7adc48f26cf +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 3f42375e2c..a333871f35 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.07.2024 ### +### HEAD as of 30.09.2024 ### ## Glance service glance_git_repo: "{{ openstack_opendev_base_url }}/openstack/glance" -glance_git_install_branch: ee7e96f06af741bb34bedac18fa2c4616fcc3905 -glance_git_track_branch: master +glance_git_install_branch: 1629d1107314dc24fa04f6a2218ddfcabe661eea +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 3d4a1567c7..81b9b19686 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 25.03.2024 ### +### HEAD as of 03.09.2024 ### ## 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: b37b943579e4e5300e274284a2b6e5e287bd1d9e +gnocchi_git_install_branch: 5f26d4f10ae6eaaeb33a5c5bed8bd773df8e97f7 gnocchi_git_track_branch: stable/4.6 diff --git a/inventory/group_vars/heat_all/source_git.yml b/inventory/group_vars/heat_all/source_git.yml index a7de5f17e4..dcab852f97 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.07.2024 ### +### HEAD as of 30.09.2024 ### ## Heat service heat_git_repo: "{{ openstack_opendev_base_url }}/openstack/heat" -heat_git_install_branch: 57e686bdfb8ed9aa12e518ba947989c21a35e89f -heat_git_track_branch: master +heat_git_install_branch: 008c18f88c9c2fabae9dbf62d174a4d3b380010d +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 fa38b25964..088fa7e625 100644 --- a/inventory/group_vars/horizon_all/source_git.yml +++ b/inventory/group_vars/horizon_all/source_git.yml @@ -13,17 +13,17 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.07.2024 ### +### HEAD as of 30.09.2024 ### ## Horizon service horizon_git_repo: "{{ openstack_opendev_base_url }}/openstack/horizon" -horizon_git_install_branch: e3f83c0ef6fb82c762b76f7d87d9d59fc280ecc0 -horizon_git_track_branch: master +horizon_git_install_branch: e70198f486afc59621780c2de4d48c990300cb31 +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_track_branch: master +adjutant_dashboard_git_track_branch: stable/2024.2 ## Barbican dashboard plugin barbican_dashboard_git_repo: "{{ openstack_opendev_base_url }}//openstack/barbican-ui" @@ -32,50 +32,40 @@ barbican_dashboard_git_track_branch: master ## Cloudkitty dashboard plugin cloudkitty_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/cloudkitty-dashboard" -cloudkitty_dashboard_git_install_branch: e7bf46d8a47041be6bc7daa50ba42efab7936db8 -cloudkitty_dashboard_git_track_branch: master +cloudkitty_dashboard_git_install_branch: 83dd80e1ec1afef8d8c1d7bcaabfad522877e524 +cloudkitty_dashboard_git_track_branch: stable/2024.2 ## Horizon Designate dashboard plugin designate_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/designate-dashboard" -designate_dashboard_git_install_branch: db8894f0cc0526485c8578d57689a197a9081425 -designate_dashboard_git_track_branch: master +designate_dashboard_git_install_branch: e7f1583643792b858142bcd4a7d99950646e6ffd +designate_dashboard_git_track_branch: stable/2024.2 ## Horizon Heat dashboard plugin heat_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/heat-dashboard" -heat_dashboard_git_install_branch: 3070b2c8d5cc6e070df01233ec50b32ea987d92d -heat_dashboard_git_track_branch: master +heat_dashboard_git_install_branch: f6dc92a972c36f9e8258a16ec0891845ef8accca +heat_dashboard_git_track_branch: stable/2024.2 ## Horizon Ironic dashboard plugin ironic_dashboard_git_repo: "{{ openstack_opendev_base_url}}/openstack/ironic-ui" -ironic_dashboard_git_install_branch: 297c9849dca378f1af9b48fa8e0f4ace383505f3 -ironic_dashboard_git_track_branch: master +ironic_dashboard_git_install_branch: 40d8f907334c113cf2fe43bd2a5bbbef6baadbab +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: 736edbaa8669737d8bea48dacdff9235ec97c4c5 -magnum_dashboard_git_track_branch: master +magnum_dashboard_git_track_branch: stable/2024.2 ## Horizon Masakari dashboard plugin masakari_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/masakari-dashboard" -masakari_dashboard_git_install_branch: 30139f0865a7d26f3eae3fc7c8985285a10157b6 -masakari_dashboard_git_track_branch: master - -## Horizon Murano dashboard plugin -murano_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/murano-dashboard" -murano_dashboard_git_install_branch: 529ca498a78e5aab50c266e46ecb1b5de96a8674 -murano_dashboard_git_track_branch: master - -## Horizon Sahara dashboard plugin -sahara_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/sahara-dashboard" -sahara_dashboard_git_install_branch: af37b9efbf0d122d31579d9fc1b6a7b8457435bd -sahara_dashboard_git_track_branch: master +masakari_dashboard_git_install_branch: 5359702bfe6ab9f8cbd868c1558553f4ce417839 +masakari_dashboard_git_track_branch: stable/2024.2 ## Horizon Trove dashboard plugin trove_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/trove-dashboard" -trove_dashboard_git_install_branch: 055a1a819fe1f2b537e7e3a7389bded47548bfec -trove_dashboard_git_track_branch: master +trove_dashboard_git_install_branch: 3f2557b448ae43225e299c8c3137727eeb2b751c +trove_dashboard_git_track_branch: stable/2024.2 ## Horizon Octavia dashboard plugin octavia_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/octavia-dashboard" -octavia_dashboard_git_install_branch: 979ee7f213b1cfc5a447c2b838e701c7a1358530 -octavia_dashboard_git_track_branch: master +octavia_dashboard_git_install_branch: 1d4b034669c819217a0f58a394dae4340661bdeb +octavia_dashboard_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/ironic_all/source_git.yml b/inventory/group_vars/ironic_all/source_git.yml index c8851bce95..2fb9b9dba5 100644 --- a/inventory/group_vars/ironic_all/source_git.yml +++ b/inventory/group_vars/ironic_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.07.2024 ### +### HEAD as of 30.09.2024 ### ## Ironic service ironic_git_repo: "{{ openstack_opendev_base_url }}/openstack/ironic" -ironic_git_install_branch: acf1c7d43ef437450f86190672758b9ec8cbb8b9 -ironic_git_track_branch: master +ironic_git_install_branch: 3f7f75f47d4eac9c6ba74e59a6587d2f0e01ebd7 +ironic_git_track_branch: stable/2024.2 ## Ironic inspector service ironic_inspector_git_repo: "{{ openstack_opendev_base_url }}/openstack/ironic-inspector" -ironic_inspector_git_install_branch: 43248710fa307e4d01ef157ecec83995add6ae7d -ironic_inspector_git_track_branch: master +ironic_inspector_git_install_branch: 5a0f2506dc2fce3af4e3b12e5a1c53ca879ae716 +ironic_inspector_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/keystone_all/source_git.yml b/inventory/group_vars/keystone_all/source_git.yml index 944d691aec..64ccb15108 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.07.2024 ### +### HEAD as of 30.09.2024 ### ## Keystone service keystone_git_repo: "{{ openstack_opendev_base_url }}/openstack/keystone" -keystone_git_install_branch: 181dc7b03fec6b1868dc263d9804f6cdc34ddf1b -keystone_git_track_branch: master +keystone_git_install_branch: 102821492e06db37ea376d2456e978e0a6df7ce6 +keystone_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 4bb3fbb400..874ea99b84 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 05.07.2024 ### +### HEAD as of 30.09.2024 ### ## Magnum service magnum_git_repo: "{{ openstack_opendev_base_url }}/openstack/magnum" -magnum_git_install_branch: 8d09169a8aa4d8425e9ab7f37bbb636c4410a39f -magnum_git_track_branch: master +magnum_git_install_branch: 17a081b3da5b7af524dcd7d9cc96a9ff4ab588ed +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 212bc04147..12597a0fe5 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.07.2024 ### +### HEAD as of 30.09.2024 ### ## Manila service manila_git_repo: "{{ openstack_opendev_base_url }}/openstack/manila" -manila_git_install_branch: 551bbe366e59296dab341b864a27bb1cd11b4e55 -manila_git_track_branch: master +manila_git_install_branch: 8c57c7a46f04472d0e608ee7f805f15279443d78 +manila_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/masakari_all/source_git.yml b/inventory/group_vars/masakari_all/source_git.yml index 5677fd03c2..f21308bd00 100644 --- a/inventory/group_vars/masakari_all/source_git.yml +++ b/inventory/group_vars/masakari_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.07.2024 ### +### HEAD as of 30.09.2024 ### ## Masakari service masakari_git_repo: "{{ openstack_opendev_base_url }}/openstack/masakari" -masakari_git_install_branch: d6bd0ae227b765683c7d966513b7de9a3b024fbf -masakari_git_track_branch: master +masakari_git_install_branch: 4108774b8b8f9e04859b615d2892678a9c7ef3ed +masakari_git_track_branch: stable/2024.2 ## Masakari monitors services masakari_monitors_git_repo: "{{ openstack_opendev_base_url }}/openstack/masakari-monitors" -masakari_monitors_git_install_branch: 65eb41d099bebd7eead9dd91fc49ab45277b9a4c -masakari_monitors_git_track_branch: master +masakari_monitors_git_install_branch: d7ab72905c4ce65726b00aad15638f6c4c2bff72 +masakari_monitors_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 4461352d47..6e1afb571a 100644 --- a/inventory/group_vars/mistral_all/source_git.yml +++ b/inventory/group_vars/mistral_all/source_git.yml @@ -13,13 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 05.06.2024 ### +### HEAD as of 30.09.2024 ### ## Mistral service mistral_git_repo: "{{ openstack_opendev_base_url }}/openstack/mistral" -mistral_git_install_branch: 0e03f2db5ea144e5ea840cd31ba26d1061df869e -mistral_git_track_branch: master +mistral_git_install_branch: c4d32f8ae4c56955a97031f087b8e269ec8e45ab +mistral_git_track_branch: stable/2024.2 mistral_extra_git_repo: "{{ openstack_opendev_base_url }}/openstack/mistral-extra" -mistral_extra_git_install_branch: 660dd14be5c810cc7f3a037d8439676f432987b6 -mistral_extra_git_track_branch: master +mistral_extra_git_install_branch: 6f0444d0fe40ad6189c633c74fadd46dcf03a2c0 +mistral_extra_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 771d54215c..146fed2d47 100644 --- a/inventory/group_vars/neutron_all/source_git.yml +++ b/inventory/group_vars/neutron_all/source_git.yml @@ -13,32 +13,32 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.07.2024 ### +### HEAD as of 30.09.2024 ### ## Neutron service neutron_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron" -neutron_git_install_branch: 725f3cbd8e9dfab18cccdcb2073f49473e634346 -neutron_git_track_branch: master +neutron_git_install_branch: 363ffa6e9e1ab5968f87d45bc2f1cb6394f48b9f +neutron_git_track_branch: stable/2024.2 neutron_vpnaas_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-vpnaas" -neutron_vpnaas_git_install_branch: f2fcd4586c96e7ff4fa5ca368fbe89cffa55fe7a -neutron_vpnaas_git_track_branch: master +neutron_vpnaas_git_install_branch: 7e221589d7f7d61b141b3c7afaeb46860e0af3b9 +neutron_vpnaas_git_track_branch: stable/2024.2 neutron_dynamic_routing_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-dynamic-routing" -neutron_dynamic_routing_git_install_branch: 15d30d02631ccd92a25a3e45827c664a7eda8149 -neutron_dynamic_routing_git_track_branch: master +neutron_dynamic_routing_git_install_branch: 1d3ecd2cf3ebc82267406d59e06f3f3b97ffdcd4 +neutron_dynamic_routing_git_track_branch: stable/2024.2 networking_bgpvpn_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-bgpvpn" -networking_bgpvpn_git_install_branch: e62d94fc981f2a54381c6f1d3978e1e89c58d560 -networking_bgpvpn_git_track_branch: master +networking_bgpvpn_git_install_branch: d033c3722039e1a2477e2569ef2194ca0ae69bf7 +networking_bgpvpn_git_track_branch: stable/2024.2 networking_sfc_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-sfc" -networking_sfc_git_install_branch: bcc6be3e8b4e89ad6bb6bff66d2c537ee8c77f18 -networking_sfc_git_track_branch: master +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: 6ec86702bb07fe819f3b59a102f107015edabcad -networking_generic_switch_git_track_branch: master +networking_generic_switch_git_install_branch: 6f29bfb5598fcaf8a3acbfcf180da8bf82bb08de +networking_generic_switch_git_track_branch: stable/2024.2 networking_nsx_git_repo: "{{ openstack_opendev_base_url }}/x/vmware-nsx" networking_nsx_git_install_branch: 715cb5fc1174b9226f043e49ffd389add44f070a @@ -49,9 +49,9 @@ networking_nsxlib_git_install_branch: 1fa9910c1ba096d0e1c26fb9f3be417958c95d75 networking_nsxlib_git_track_branch: master networking_baremetal_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-baremetal" -networking_baremetal_git_install_branch: 0bf02fbbbacb19760fcbc4375e2ce2acf1a7bf35 -networking_baremetal_git_track_branch: master +networking_baremetal_git_install_branch: 52c45c07d3c860105c86dc1f2e48f17c4cd0a47d +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: 5238fad3755be811b987fc1fa5ca9f4a315dcd19 -networking_ovn_bgp_git_track_branch: master +networking_ovn_bgp_git_install_branch: a2cc1363c57202a28e1b0090594672dab8501f6f +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 a80f77f7ba..89f3e2c1fe 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.07.2024 ### +### HEAD as of 30.09.2024 ### ## NOVNC from source novncproxy_git_repo: "{{ openstack_github_base_url }}/novnc/noVNC" -novncproxy_git_install_branch: 1230a4ce738ebccce80fc08ee6172bc3a19fadba +novncproxy_git_install_branch: 047531e8860ad315cb56fe63602bcccaecc9883a 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: eb5e3374bcb5de3b5986b66438a59c73be7fb596 -nova_git_track_branch: master +nova_git_install_branch: bef7768ee586f28e40486c864479260f26da7539 +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 47e3dfdc70..a5c1dd1355 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.07.2024 ### +### HEAD as of 30.09.2024 ### ## Octavia service octavia_git_repo: "{{ openstack_opendev_base_url }}/openstack/octavia" -octavia_git_install_branch: 1c027c840c57c425519542218898fd2d33fda064 -octavia_git_track_branch: master +octavia_git_install_branch: 20d97469e1047f911347cdb2503612033b9f0075 +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: d123e764e1c5efdbde8c04de725a01dca58254e7 -octavia_ovn_octavia_provider_git_track_branch: master +octavia_ovn_octavia_provider_git_install_branch: 156ca765008943d2f6de4f2d14b23e56fc660945 +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 2fc2f291fd..449eca768b 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 05.06.2024 ### +### HEAD as of 30.09.2024 ### ## Placement service placement_git_repo: "{{ openstack_opendev_base_url }}/openstack/placement" -placement_git_install_branch: c8255d70c89f60cf85676ac5cfbb313ea44645c0 -placement_git_track_branch: master +placement_git_install_branch: 901dc8274a3198c38bd0faa515c729903d5d1e0d +placement_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 a394478fa6..c68309e265 100644 --- a/inventory/group_vars/skyline_all/source_git.yml +++ b/inventory/group_vars/skyline_all/source_git.yml @@ -13,13 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 05.07.2024 ### +### HEAD as of 03.09.2024 ### ## Skyline service skyline_git_repo: "{{ openstack_opendev_base_url }}/openstack/skyline-apiserver" -skyline_git_install_branch: 2a3a08e32830216e7c5e5b05880253a4b34e03af -skyline_git_track_branch: master +skyline_git_install_branch: 4e06ed4a5ab1ad454fcd1f245af982c7a9cfb759 +skyline_git_track_branch: stable/2024.2 skyline_console_git_repo: "{{ openstack_opendev_base_url }}/openstack/skyline-console" -skyline_console_git_install_branch: 4.0.0 +skyline_console_git_install_branch: 5.0.0.0rc2 skyline_console_git_track_branch: None diff --git a/inventory/group_vars/swift_all/source_git.yml b/inventory/group_vars/swift_all/source_git.yml index f4a82cb2c8..a33964e396 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 26.07.2024 ### +### HEAD as of 30.09.2024 ### ## Swift service swift_git_repo: "{{ openstack_opendev_base_url }}/openstack/swift" -swift_git_install_branch: 682c71afe4b1c253651856593441df8fbccbdcbb -swift_git_track_branch: master +swift_git_install_branch: 27503ac2df5cb77b5fdf29196e555178ddbfdef7 +swift_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/tacker_all/source_git.yml b/inventory/group_vars/tacker_all/source_git.yml index afb37e8693..f91867a8e1 100644 --- a/inventory/group_vars/tacker_all/source_git.yml +++ b/inventory/group_vars/tacker_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 05.06.2024 ### +### HEAD as of 30.09.2024 ### ## Tacker service tacker_git_repo: "{{ openstack_opendev_base_url }}/openstack/tacker" -tacker_git_install_branch: ead054ecf5a7225c873b1668d4490257f13ced1a -tacker_git_track_branch: master +tacker_git_install_branch: fa641793f4dccbc7ad49c071535d7dc0eb4c428a +tacker_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 5a602075d2..0792020ede 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 26.07.2024 ### +### HEAD as of 30.09.2024 ### ## Trove service trove_git_repo: "{{ openstack_opendev_base_url }}/openstack/trove" -trove_git_install_branch: 3f521cb7f577635ee74b2a48c70f874dab2f9e30 -trove_git_track_branch: master +trove_git_install_branch: f4986a7e510146f758caab9b32e29171433bb82c +trove_git_track_branch: stable/2024.2 diff --git a/inventory/group_vars/utility_all/source_git.yml b/inventory/group_vars/utility_all/source_git.yml index ed021cbbc0..b2a942c0d5 100644 --- a/inventory/group_vars/utility_all/source_git.yml +++ b/inventory/group_vars/utility_all/source_git.yml @@ -13,96 +13,96 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 26.07.2024 ### +### HEAD as of 03.09.2024 ### tempest_git_repo: "{{ openstack_opendev_base_url }}/openstack/tempest" -tempest_git_install_branch: 1af21705c53bc9911ea467eaeee2bc12489a43ed -tempest_git_track_branch: master +tempest_git_install_branch: f6bb9d1e4b30ac11132023d11c36f1fb48b2934a +tempest_git_track_branch: None tempest_plugin_barbican_git_repo: "{{ openstack_opendev_base_url }}/openstack/barbican-tempest-plugin" tempest_plugin_barbican_git_install_branch: d7f96744c352e16301832751ae4af14818c4ec5c -tempest_plugin_barbican_git_track_branch: master +tempest_plugin_barbican_git_track_branch: None tempest_plugin_blazar_git_repo: "{{ openstack_opendev_base_url }}/openstack/blazar-tempest-plugin" tempest_plugin_blazar_git_install_branch: 12c9fbd583a25d07a0f4670e6d827c6ac57a1468 -tempest_plugin_blazar_git_track_branch: master +tempest_plugin_blazar_git_track_branch: None tempest_plugin_cinder_git_repo: "{{ openstack_opendev_base_url }}/openstack/cinder-tempest-plugin" -tempest_plugin_cinder_git_install_branch: 68347e7d76ccbcf3927f9fabeaa5e88b98bd9082 -tempest_plugin_cinder_git_track_branch: master +tempest_plugin_cinder_git_install_branch: 1aa0a56fca85ce23343950431e28f41c4fa811c5 +tempest_plugin_cinder_git_track_branch: None tempest_plugin_cloudkitty_git_repo: "{{ openstack_opendev_base_url }}/openstack/cloudkitty-tempest-plugin" tempest_plugin_cloudkitty_git_install_branch: 2dbae91dd6fa4dd1d95317e2d5a4dbe557b8b249 -tempest_plugin_cloudkitty_git_track_branch: master +tempest_plugin_cloudkitty_git_track_branch: None tempest_plugin_designate_git_repo: "{{ openstack_opendev_base_url }}/openstack/designate-tempest-plugin" -tempest_plugin_designate_git_install_branch: 7767d31665fec70c088e6aa2d2757eece21dfda7 -tempest_plugin_designate_git_track_branch: master +tempest_plugin_designate_git_install_branch: bb1996d7a87c7a68262506b8d5185b81b436e4c4 +tempest_plugin_designate_git_track_branch: None tempest_plugin_glance_git_repo: "{{ openstack_opendev_base_url }}/openstack/glance-tempest-plugin" tempest_plugin_glance_git_install_branch: e94d4cfd2a1dab903f544a3df8f45071a45e505e -tempest_plugin_glance_git_track_branch: master +tempest_plugin_glance_git_track_branch: None tempest_plugin_heat_git_repo: "{{ openstack_opendev_base_url }}/openstack/heat-tempest-plugin" tempest_plugin_heat_git_install_branch: 09ef48ced5026f417c745a876dc925e32a39faff -tempest_plugin_heat_git_track_branch: master +tempest_plugin_heat_git_track_branch: None tempest_plugin_ironic_git_repo: "{{ openstack_opendev_base_url }}/openstack/ironic-tempest-plugin" tempest_plugin_ironic_git_install_branch: 6d1e5510bff12c62e15e0b3e9ec3a7dc87ea752d -tempest_plugin_ironic_git_track_branch: master +tempest_plugin_ironic_git_track_branch: None tempest_plugin_keystone_git_repo: "{{ openstack_opendev_base_url }}/openstack/keystone-tempest-plugin" -tempest_plugin_keystone_git_install_branch: a49f970b62876e7cd9445658a1994a8947a0e4fa -tempest_plugin_keystone_git_track_branch: master +tempest_plugin_keystone_git_install_branch: 8ac8c4ff9cf435d3938eb9e28ffc2167d8d98bb3 +tempest_plugin_keystone_git_track_branch: None tempest_plugin_magnum_git_repo: "{{ openstack_opendev_base_url }}/openstack/magnum-tempest-plugin" tempest_plugin_magnum_git_install_branch: ecb2436a5213879968c8b2cdd54301031b575870 -tempest_plugin_magnum_git_track_branch: master +tempest_plugin_magnum_git_track_branch: None tempest_plugin_manila_git_repo: "{{ openstack_opendev_base_url }}/openstack/manila-tempest-plugin" -tempest_plugin_manila_git_install_branch: a04b5f6f3e2f40cc68ef42648373fe4449da5112 -tempest_plugin_manila_git_track_branch: master +tempest_plugin_manila_git_install_branch: b758fb49cc8c9d56fa83f910f3462a845eec1b1b +tempest_plugin_manila_git_track_branch: None tempest_plugin_murano_git_repo: "{{ openstack_opendev_base_url }}/openstack/murano-tempest-plugin" tempest_plugin_murano_git_install_branch: 528f48107cee6a9d2a120e7e8c94797b3b89bbb8 -tempest_plugin_murano_git_track_branch: master +tempest_plugin_murano_git_track_branch: None tempest_plugin_neutron_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-tempest-plugin" -tempest_plugin_neutron_git_install_branch: 73a385260dc060354d5c5ec8c99e450ad29e815e -tempest_plugin_neutron_git_track_branch: master +tempest_plugin_neutron_git_install_branch: 7c4473d55c31f147154cc60487859e5db05ab5e9 +tempest_plugin_neutron_git_track_branch: None tempest_plugin_novajoin_git_repo: "{{ openstack_opendev_base_url }}/x/novajoin-tempest-plugin" tempest_plugin_novajoin_git_install_branch: d4a39ceb0f636de6a5b07b99a5a04a7a272dd398 -tempest_plugin_novajoin_git_track_branch: master +tempest_plugin_novajoin_git_track_branch: None tempest_plugin_octavia_git_repo: "{{ openstack_opendev_base_url }}/openstack/octavia-tempest-plugin" -tempest_plugin_octavia_git_install_branch: 181f31c8f54f74a44f9a4bd063d3216459ae0451 -tempest_plugin_octavia_git_track_branch: master +tempest_plugin_octavia_git_install_branch: b85b33e2b9ce12e659c66ee8f8449180d7a9d532 +tempest_plugin_octavia_git_track_branch: None tempest_plugin_senlin_git_repo: "{{ openstack_opendev_base_url }}/openstack/senlin-tempest-plugin" tempest_plugin_senlin_git_install_branch: 83ccfcbeb31517dac620e3786eae085aa851918f -tempest_plugin_senlin_git_track_branch: master +tempest_plugin_senlin_git_track_branch: None tempest_plugin_sahara_git_repo: "{{ openstack_opendev_base_url }}/openstack/sahara-tests" tempest_plugin_sahara_git_install_branch: 3815c917a31398425800001aa79e15114685d01d -tempest_plugin_sahara_git_track_branch: master +tempest_plugin_sahara_git_track_branch: None tempest_plugin_telemetry_git_repo: "{{ openstack_opendev_base_url }}/openstack/telemetry-tempest-plugin" tempest_plugin_telemetry_git_install_branch: a32f05c0baee2ddbffa4cca06bcf7501ca3dece8 -tempest_plugin_telemetry_git_track_branch: master +tempest_plugin_telemetry_git_track_branch: None tempest_plugin_trove_git_repo: "{{ openstack_opendev_base_url }}/openstack/trove-tempest-plugin" tempest_plugin_trove_git_install_branch: f557061d23f7f7dc335a196d4139abfebfadcfc5 -tempest_plugin_trove_git_track_branch: master +tempest_plugin_trove_git_track_branch: None tempest_plugin_zaqar_git_repo: "{{ openstack_opendev_base_url }}/openstack/zaqar-tempest-plugin" tempest_plugin_zaqar_git_install_branch: 96a4ea24b7f6e8ad3ebb39509648ed3397d5f15a -tempest_plugin_zaqar_git_track_branch: master +tempest_plugin_zaqar_git_track_branch: None tempest_plugin_zun_git_repo: "{{ openstack_opendev_base_url }}/openstack/zun-tempest-plugin" tempest_plugin_zun_git_install_branch: 8a0b3cf100c00c5ddbe13bc97b42f16a2bff95c1 -tempest_plugin_zun_git_track_branch: master +tempest_plugin_zun_git_track_branch: None rally_openstack_git_repo: "{{ openstack_opendev_base_url }}/openstack/rally-openstack" rally_openstack_git_install_branch: 7a45064547588d83fcad1f297c0494d725a2af83 -rally_openstack_git_track_branch: master +rally_openstack_git_track_branch: None diff --git a/inventory/group_vars/zun_all/source_git.yml b/inventory/group_vars/zun_all/source_git.yml index a6a9eb27be..716a7172db 100644 --- a/inventory/group_vars/zun_all/source_git.yml +++ b/inventory/group_vars/zun_all/source_git.yml @@ -13,19 +13,19 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 05.06.2024 ### +### HEAD as of 30.09.2024 ### ## Zun service zun_git_repo: "{{ openstack_opendev_base_url }}/openstack/zun" -zun_git_install_branch: c05fe096cd0bb5444afa33fce1280304173bb373 -zun_git_track_branch: master +zun_git_install_branch: e5a1e10a4d95684e26b71084239f82af4bd5b41d +zun_git_track_branch: stable/2024.2 ## Zun kuryr service zun_kuryr_git_repo: "{{ openstack_opendev_base_url }}/openstack/kuryr-libnetwork" -zun_kuryr_git_install_branch: c2fc51c2222aa893ec9504e7335c6203a1f20b63 -zun_kuryr_git_track_branch: master +zun_kuryr_git_install_branch: dccf32dcd47d50aa7f734e7ef9973b4446f1d26c +zun_kuryr_git_track_branch: stable/2024.2 ## Zun kuryr library zun_kuryr_lib_git_repo: "{{ openstack_opendev_base_url }}/openstack/kuryr" -zun_kuryr_lib_git_install_branch: 84c22b9a8516b86761fd52646e8510b36fd3d415 -zun_kuryr_lib_git_track_branch: master +zun_kuryr_lib_git_install_branch: 324d408c58c1a1daa036cfcf93606300ef1b873d +zun_kuryr_lib_git_track_branch: stable/2024.2 diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh index 8685baf26f..5707bd8176 100755 --- a/scripts/bootstrap-ansible.sh +++ b/scripts/bootstrap-ansible.sh @@ -22,7 +22,7 @@ set -e -u -x export HTTP_PROXY=${HTTP_PROXY:-""} export HTTPS_PROXY=${HTTPS_PROXY:-""} # The Ansible version used for testing -export ANSIBLE_PACKAGE=${ANSIBLE_PACKAGE:-"ansible-core==2.17.1"} +export ANSIBLE_PACKAGE=${ANSIBLE_PACKAGE:-"ansible-core==2.17.4"} export ANSIBLE_ROLE_FILE=${ANSIBLE_ROLE_FILE:-"ansible-role-requirements.yml"} export ANSIBLE_COLLECTION_FILE=${ANSIBLE_COLLECTION_FILE:-"ansible-collection-requirements.yml"} export USER_COLLECTION_FILE=${USER_COLLECTION_FILE:-"user-collection-requirements.yml"}