diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml
index 41d1206739..0fb4fb704d 100644
--- a/ansible-role-requirements.yml
+++ b/ansible-role-requirements.yml
@@ -2,337 +2,337 @@
- name: ansible-hardening
scm: git
src: https://opendev.org/openstack/ansible-hardening
- version: 62db209778f520db509f283e11664b77631af895
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: frrouting
scm: git
src: https://opendev.org/openstack/ansible-role-frrouting
- version: 9780a55b9506358c543669d878789cf9ffae65c5
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: pki
src: https://opendev.org/openstack/ansible-role-pki
scm: git
- version: 5751c369c403404584ec81c00cb9c69211ceeb31
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: python_venv_build
src: https://opendev.org/openstack/ansible-role-python_venv_build
scm: git
- version: ed1cb28419b8bed87bd1339ae4fde4969f1dc791
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: qdrouterd
scm: git
src: https://opendev.org/openstack/ansible-role-qdrouterd
- version: 9148558c9233404708624fa2efe4af8cd3dd910d
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: systemd_mount
src: https://opendev.org/openstack/ansible-role-systemd_mount
scm: git
- version: 35b71e22082fe8863fa19b26777ccf8874764f33
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: systemd_networkd
src: https://opendev.org/openstack/ansible-role-systemd_networkd
scm: git
- version: 2f562be134f295a5b8a4787cf6aa1a874b348185
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: systemd_service
src: https://opendev.org/openstack/ansible-role-systemd_service
scm: git
- version: ba04045af82c921b17f689f41b8c329105e2c3ee
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: uwsgi
src: https://opendev.org/openstack/ansible-role-uwsgi
scm: git
- version: 6297370afe04a6e6bf2d209c216b63f7a42008cc
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: zookeeper
src: https://opendev.org/openstack/ansible-role-zookeeper
scm: git
- version: 3feb9c5c922ee891fa47961140e11b22b5bf8390
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: apt_package_pinning
scm: git
src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning
- version: 3ccf7977593ed95beb73b1d06df37742971e937b
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: ceph_client
scm: git
src: https://opendev.org/openstack/openstack-ansible-ceph_client
- version: 19c212634db9c844dcdaa5869f53b1b83ccf8433
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: galera_server
scm: git
src: https://opendev.org/openstack/openstack-ansible-galera_server
- version: 2f2912a30812c0fa46a380c0a57ac09989e8758e
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: haproxy_server
scm: git
src: https://opendev.org/openstack/openstack-ansible-haproxy_server
- version: f4846463a5ccabfefc3d23bdb6e1779247e21d45
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: lxc_container_create
scm: git
src: https://opendev.org/openstack/openstack-ansible-lxc_container_create
- version: 48d8aa72f561edb096b6a08184335d12a1264151
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: lxc_hosts
scm: git
src: https://opendev.org/openstack/openstack-ansible-lxc_hosts
- version: 41470784fd9dc2438799f45417a9fbcef0d069d3
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: memcached_server
scm: git
src: https://opendev.org/openstack/openstack-ansible-memcached_server
- version: ac3611bfa530de2b7ead39c276841ad203ae8389
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: openstack_hosts
scm: git
src: https://opendev.org/openstack/openstack-ansible-openstack_hosts
- version: 358b58ca72ff4e4fb2af4f438e90c4671a1a8f54
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: openstack_openrc
scm: git
src: https://opendev.org/openstack/openstack-ansible-openstack_openrc
- version: eb8f61c2b1839c2c03e2c2b7829a35d12133fcbe
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_adjutant
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_adjutant
- version: 72c51d4eafb7b826bf8b31ab6a3bc04bd0ad1453
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_aodh
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_aodh
- version: 5a82775c15c1a7ba1dc6a63d152c3a2a64c53de8
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_barbican
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_barbican
- version: fd7611a37f2aacb32023e31d5f034d1cf3c5061d
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_blazar
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_blazar
- version: 31310d2e0e84eca72e08045f1f12caa60d82c95d
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_ceilometer
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_ceilometer
- version: 856abdb95169eab1483c38061daa7f33a88d3b6e
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_cinder
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_cinder
- version: 4ed60bd71c417e6df05b280e2f3c9fbad59d15c1
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_cloudkitty
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_cloudkitty
- version: 0d255e0da678539c386878188d72fee6269ada28
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_designate
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_designate
- version: b8bb86174999817867b280619005716ac33995b2
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_glance
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_glance
- version: e04d1eafca11efb8e0cb9162603ea7b8175253fb
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_gnocchi
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_gnocchi
- version: df340c2bec334dd223add8675714ef11a9e86a9d
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_heat
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_heat
- version: 49ae8d4b71e606379b9ba11abc9860957624965e
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_horizon
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_horizon
- version: 55cc1785fabee4b8c415e43127223463d5c9ef8f
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_ironic
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_ironic
- version: 1eadfb4925015a75cdc4177f93505f952fc0a18d
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_keystone
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_keystone
- version: 9d9509103f13994c8e6328438d1b6c623ee4caab
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_magnum
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_magnum
- version: be694a172572ea249fd671a4dc9d2b1b654f546a
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_manila
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_manila
- version: 8ab0d7742612b58fa83c0bd818053b773dd48a18
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_masakari
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_masakari
- version: 0de0b6f87ff4973d5fed752faf1a5095931130e0
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_mistral
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_mistral
- version: 9eda1f5d5c58923562e77d50d819dd940ec0870b
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_neutron
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_neutron
- version: 83b30f0c883c34fb00fa8c591e826d2146d35502
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_nova
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_nova
- version: f8148653a16add4b70ccb9050b5dc66259be5dfa
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_octavia
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_octavia
- version: 17dd5a3079a6da936f55b5fc2827e39e9ed2a0d0
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_placement
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_placement
- version: 896b6dd0c4bd53680ac2ce211cc4cdf98349b0c1
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_rally
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_rally
- version: 33efd75a5f96d491a484562b0097818e7831fba1
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_skyline
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_skyline
- version: 410dab5168797be342dbcc44d0a7778cc7d97e25
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_swift
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_swift
- version: cac65179c9adde53031f773cbad798ad1536eeaf
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_tacker
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_tacker
- version: 224ebf312fbdfde97535767337f24492135fd7a1
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_tempest
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_tempest
- version: 14d42482b4d657b4fe1b10bfcd94b7cda4205e87
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_trove
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_trove
- version: c29e5e5e139441f31ae4abd9fb561a1e7d7bd648
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: os_zun
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_zun
- version: d7b3f715a9adc629088660bc4ffac61eee71f287
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: rabbitmq_server
scm: git
src: https://opendev.org/openstack/openstack-ansible-rabbitmq_server
- version: 1afc2a503be837afacf30f8171bf7af90c6cfbd7
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
- name: repo_server
scm: git
src: https://opendev.org/openstack/openstack-ansible-repo_server
- version: c314d4299807cc20fc1c593e227d5b028b763ae2
- trackbranch: stable/2024.2
+ version: master
+ trackbranch: master
shallow_since: '2024-11-27'
# External dependencies
- name: etcd
scm: git
src: https://github.com/noonedeadpunk/ansible-etcd
- version: de3b061e954d3259e0a48e2e55878f598ef3a9c1
- trackbranch: None
+ version: master
+ trackbranch: master
shallow_since: '2023-04-11'
- name: keepalived
scm: git
src: https://github.com/evrardjp/ansible-keepalived
- version: a73191c2e49cc7ce1c4a17fd90ef460c76439e94
- trackbranch: None
+ version: master
+ trackbranch: master
shallow_since: '2023-05-18'
- name: pacemaker_corosync
scm: git
src: https://github.com/noonedeadpunk/ansible-pacemaker-corosync
- version: f05132b5334dfec0414bb82c4e6f015cf64907b5
- trackbranch: None
+ version: master
+ trackbranch: master
shallow_since: '2024-06-13'
- name: resolvconf
scm: git
src: https://github.com/logan2211/ansible-resolvconf
- version: f7f694b3dd4361e364dccb4ce94e6510727fca2f
- trackbranch: None
+ version: master
+ trackbranch: master
shallow_since: '2021-03-31'
- name: unbound
scm: git
src: https://github.com/noonedeadpunk/ansible-role-unbound
- version: 26abb238925dec80707ef7e4b869b3c5e48d4f7b
- trackbranch: None
+ version: master
+ trackbranch: master
shallow_since: '2023-02-09'
- name: ceph-ansible
scm: git
src: https://github.com/ceph/ceph-ansible
- version: 88b6ecef519e52fcd2b7368905f847fa53dcd1d5
+ version: stable-8.0
trackbranch: stable-8.0
shallow_since: '2024-10-28'
diff --git a/deploy-guide/source/conf.py b/deploy-guide/source/conf.py
index 5f8b72a881..67c6a6dd0c 100644
--- a/deploy-guide/source/conf.py
+++ b/deploy-guide/source/conf.py
@@ -32,8 +32,8 @@ import openstackdocstheme
# Variables to override
target_name = 'openstack-ansible'
description = 'OpenStack-Ansible deploys OpenStack environments using Ansible.'
-previous_series_name = '2024.1'
-current_series_name = '2024.2'
+previous_series_name = '2024.2'
+current_series_name = '2025.1'
# General information about the project.
author = 'OpenStack-Ansible Contributors'
diff --git a/doc/source/admin/upgrades/os-compatibility-matrix.html b/doc/source/admin/upgrades/os-compatibility-matrix.html
index 91e6f873a2..0633e94b0f 100644
--- a/doc/source/admin/upgrades/os-compatibility-matrix.html
+++ b/doc/source/admin/upgrades/os-compatibility-matrix.html
@@ -128,4 +128,25 @@
| ✘ |
E |
+
+ | 2025.1 (Epoxy)
+ | source |
+ ✘ |
+ ✔ |
+ ✔ |
+ ✔ |
+ ✘ |
+ ✔ |
+ ✔ |
+
+
+ | distro |
+ ✘ |
+ ✘ |
+ E |
+ E |
+ ✘ |
+ ✘ |
+ E |
+
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 7325d5b542..7d32966f6b 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -33,9 +33,9 @@ import yaml
# Variables to override
target_name = 'openstack-ansible'
description = 'OpenStack-Ansible deploys OpenStack environments using Ansible.'
-previous_series_name = '2024.1'
-previous_slurp_name = None
-current_series_name = '2024.2'
+previous_series_name = '2024.2'
+previous_slurp_name = '2024.1'
+current_series_name = '2025.1'
# General information about the project.
author = 'OpenStack-Ansible Contributors'
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 79144b480c..bf5fb31289 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -9,10 +9,10 @@ configuration of an OpenStack environment.
Documentation for each of the following releases is available.
-2024.2 (Dalmatian): Under development
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+2025.1 (Epoxy): Under development
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-OpenStack-Ansible 2024.2 (Dalmatian) is currently Under Development.
+OpenStack-Ansible 2025.1 (Epoxy) is currently Under Development.
.. toctree::
:maxdepth: 1
@@ -25,10 +25,24 @@ OpenStack-Ansible 2024.2 (Dalmatian) is currently Under Development.
contributor/index
reference/index
+2024.2 (Dalmatian): Maintained
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+OpenStack-Ansible 2024.2 (Dalmatian) was first released with the 30.0.0 tag on
+November 28, 2024.
+
+* `OpenStack-Ansible 2024.2 Documentation`_
+
+* `OpenStack-Ansible 2024.2 series release notes`_
+
+.. _OpenStack-Ansible 2024.2 Documentation: https://docs.openstack.org/openstack-ansible/2024.2/
+.. _OpenStack-Ansible 2024.2 series release notes: https://docs.openstack.org/releasenotes/openstack-ansible/2024.2.html
+
+
2024.1 (Caracal): Maintained
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-OpenStack-Ansible 2024.1 (Bobcat) was first released with the 29.0.0 tag on
+OpenStack-Ansible 2024.1 (Caracal) was first released with the 29.0.0 tag on
June 6, 2024.
* `OpenStack-Ansible 2024.1 Documentation`_
diff --git a/inventory/group_vars/adjutant_all/source_git.yml b/inventory/group_vars/adjutant_all/source_git.yml
index 36cb149dcc..e393c6b842 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 28.11.2024 ###
## Adjutant service
adjutant_git_repo: "{{ openstack_opendev_base_url }}/openstack/adjutant"
-adjutant_git_install_branch: b8c1194f908fe2c2c9c497864ffb8025829d5ce0
-adjutant_git_track_branch: stable/2024.2
+adjutant_git_install_branch: 7cdf620889d5fc523a4bd451810351dd8c6724a9
+adjutant_git_track_branch: master
diff --git a/inventory/group_vars/all/source_git.yml b/inventory/group_vars/all/source_git.yml
index 4cd2e1648b..7bdc835a3a 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 28.11.2024 ###
## Global Requirements
requirements_git_repo: "{{ openstack_opendev_base_url }}/openstack/requirements"
-requirements_git_install_branch: 9a8c2060724233415cb3d751947eaf30f7936d58
-requirements_git_track_branch: stable/2024.2
+requirements_git_install_branch: f2550a21f3b48c7376989b7a95500f48facf4ff7
+requirements_git_track_branch: master
diff --git a/inventory/group_vars/aodh_all/source_git.yml b/inventory/group_vars/aodh_all/source_git.yml
index fc96176531..8545dae2cb 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 30.09.2024 ###
+### HEAD as of 28.11.2024 ###
## Aodh service
aodh_git_repo: "{{ openstack_opendev_base_url }}/openstack/aodh"
-aodh_git_install_branch: faef3b0c7a84704c10d99754179989e656db5c53
-aodh_git_track_branch: stable/2024.2
+aodh_git_install_branch: 10cde330b5ab0340dbef17bba07df6c4c429c1a8
+aodh_git_track_branch: master
diff --git a/inventory/group_vars/barbican_all/source_git.yml b/inventory/group_vars/barbican_all/source_git.yml
index cc033a9fc7..0750bbb797 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.11.2024 ###
+### HEAD as of 28.11.2024 ###
## Barbican service
barbican_git_repo: "{{ openstack_opendev_base_url }}/openstack/barbican"
-barbican_git_install_branch: b5841df387e5ab38caf173950a1d98ab37a51453
-barbican_git_track_branch: stable/2024.2
+barbican_git_install_branch: 49c7ac543f68ffe07bb7f32b42656c0e80ec3ac2
+barbican_git_track_branch: master
diff --git a/inventory/group_vars/blazar_all/source_git.yml b/inventory/group_vars/blazar_all/source_git.yml
index c5e5e94d0b..7cde9484fb 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 26.11.2024 ###
+### HEAD as of 28.11.2024 ###
## Blazar service
blazar_git_repo: "{{ openstack_opendev_base_url }}/openstack/blazar"
-blazar_git_install_branch: 03630d9ffd3d0b585cb337400fe6c0c6facd9aac
-blazar_git_track_branch: stable/2024.2
+blazar_git_install_branch: 768c671a5993f1169e29082d21768d11011f67b9
+blazar_git_track_branch: master
## Blazar Nova Service
blazar_nova_git_repo: "{{ openstack_opendev_base_url }}/openstack/blazar-nova"
-blazar_nova_git_install_branch: 85d3340e0f671404c8f5f339b95caf963f44718c
-blazar_nova_git_track_branch: stable/2024.2
+blazar_nova_git_install_branch: ce10d267260b8f8005f484bbb7398be39b38f2d1
+blazar_nova_git_track_branch: master
diff --git a/inventory/group_vars/ceilometer_all/source_git.yml b/inventory/group_vars/ceilometer_all/source_git.yml
index a3e881637a..05e7279ea1 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 28.11.2024 ###
## Ceilometer service
ceilometer_git_repo: "{{ openstack_opendev_base_url }}/openstack/ceilometer"
-ceilometer_git_install_branch: a36cc766ca7366ce09bd41f32c81b9f28c6e3675
-ceilometer_git_track_branch: stable/2024.2
+ceilometer_git_install_branch: 27faf0e97c52aa1379aafa9ac02ccced7a2c749d
+ceilometer_git_track_branch: master
diff --git a/inventory/group_vars/cinder_all/source_git.yml b/inventory/group_vars/cinder_all/source_git.yml
index aa23b1f8ab..c063d40c1e 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 28.11.2024 ###
## Cinder service
cinder_git_repo: "{{ openstack_opendev_base_url }}/openstack/cinder"
-cinder_git_install_branch: 9dbf2967bee1060ae7419897942dfe554432a742
-cinder_git_track_branch: stable/2024.2
+cinder_git_install_branch: 6e5e0b78b32d84c547183c17a19b1f5fdfc2d4dc
+cinder_git_track_branch: master
diff --git a/inventory/group_vars/cloudkitty_all/source_git.yml b/inventory/group_vars/cloudkitty_all/source_git.yml
index e440829a06..b55dd23f41 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 28.11.2024 ###
## Cloudkitty service
cloudkitty_git_repo: "{{ openstack_opendev_base_url }}/openstack/cloudkitty"
-cloudkitty_git_install_branch: 82b0d01fae653f2f702d3be49a2dce01b69f89a0
-cloudkitty_git_track_branch: stable/2024.2
+cloudkitty_git_install_branch: 8047e5d3ddb0f4c9e3c64b68688f1ada819e3cde
+cloudkitty_git_track_branch: master
diff --git a/inventory/group_vars/designate_all/source_git.yml b/inventory/group_vars/designate_all/source_git.yml
index 4549c5191f..1b9eff50fb 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 28.11.2024 ###
## Designate service
designate_git_repo: "{{ openstack_opendev_base_url }}/openstack/designate"
-designate_git_install_branch: a2f6f07e2ca7d1b67b8b221bed0529e93aebc90a
-designate_git_track_branch: stable/2024.2
+designate_git_install_branch: a0935ea53ae20fa85c4af49c8cfb3b8b38125bef
+designate_git_track_branch: master
diff --git a/inventory/group_vars/glance_all/source_git.yml b/inventory/group_vars/glance_all/source_git.yml
index 7afbbf63b4..54ebc8315b 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 28.11.2024 ###
## Glance service
glance_git_repo: "{{ openstack_opendev_base_url }}/openstack/glance"
-glance_git_install_branch: 0dcb9aff2c8f96e33a3dc1f40b5cb3c4cee758ad
-glance_git_track_branch: stable/2024.2
+glance_git_install_branch: 54d5c3950179513fb127952574e487ea81914a63
+glance_git_track_branch: master
diff --git a/inventory/group_vars/heat_all/source_git.yml b/inventory/group_vars/heat_all/source_git.yml
index 85059bd557..ad579cd120 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 28.11.2024 ###
## Heat service
heat_git_repo: "{{ openstack_opendev_base_url }}/openstack/heat"
-heat_git_install_branch: 64bdbb9bc66c38760989dd7bb2574ccc14069872
-heat_git_track_branch: stable/2024.2
+heat_git_install_branch: 042bed8044207bfbbcbd43cc6da8423d1952547b
+heat_git_track_branch: master
diff --git a/inventory/group_vars/horizon_all/source_git.yml b/inventory/group_vars/horizon_all/source_git.yml
index dca76b45b0..3d965d9167 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.11.2024 ###
+### HEAD as of 28.11.2024 ###
## Horizon service
horizon_git_repo: "{{ openstack_opendev_base_url }}/openstack/horizon"
-horizon_git_install_branch: e70198f486afc59621780c2de4d48c990300cb31
-horizon_git_track_branch: stable/2024.2
+horizon_git_install_branch: 1b15f51babd107b82accbe9baea0fb882303267e
+horizon_git_track_branch: master
## 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: stable/2024.2
+adjutant_dashboard_git_install_branch: 8adc451be16a677e72a68cd766f5c2e438e57fb2
+adjutant_dashboard_git_track_branch: master
## Barbican dashboard plugin
barbican_dashboard_git_repo: "{{ openstack_opendev_base_url }}//openstack/barbican-ui"
@@ -32,50 +32,50 @@ 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: 83dd80e1ec1afef8d8c1d7bcaabfad522877e524
-cloudkitty_dashboard_git_track_branch: stable/2024.2
+cloudkitty_dashboard_git_install_branch: 428d61da8997df672e6337ef47b939d191a2dbc9
+cloudkitty_dashboard_git_track_branch: master
## Horizon Designate dashboard plugin
designate_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/designate-dashboard"
-designate_dashboard_git_install_branch: e7f1583643792b858142bcd4a7d99950646e6ffd
-designate_dashboard_git_track_branch: stable/2024.2
+designate_dashboard_git_install_branch: 205ecc2b95fcd64cc2461a7c27a4dd995d9bb396
+designate_dashboard_git_track_branch: master
## Horizon Heat dashboard plugin
heat_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/heat-dashboard"
-heat_dashboard_git_install_branch: f6dc92a972c36f9e8258a16ec0891845ef8accca
-heat_dashboard_git_track_branch: stable/2024.2
+heat_dashboard_git_install_branch: 21a79fea267cfa205fa60b4aef84d148cf8e376e
+heat_dashboard_git_track_branch: master
## Horizon Ironic dashboard plugin
ironic_dashboard_git_repo: "{{ openstack_opendev_base_url}}/openstack/ironic-ui"
-ironic_dashboard_git_install_branch: 40d8f907334c113cf2fe43bd2a5bbbef6baadbab
-ironic_dashboard_git_track_branch: stable/2024.2
+ironic_dashboard_git_install_branch: 763f9054fca399e8e4fa1186dadd50ecf31c4b00
+ironic_dashboard_git_track_branch: master
## Horizon Magnum dashboard plugin
magnum_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/magnum-ui"
-magnum_dashboard_git_install_branch: 5f285a0863484e521d18d2b4f2fcf6f04e543f78
-magnum_dashboard_git_track_branch: stable/2024.2
+magnum_dashboard_git_install_branch: bd7662480f4ecb635bf01e900a576322723012a6
+magnum_dashboard_git_track_branch: master
## Horizon Masakari dashboard plugin
masakari_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/masakari-dashboard"
-masakari_dashboard_git_install_branch: 5359702bfe6ab9f8cbd868c1558553f4ce417839
-masakari_dashboard_git_track_branch: stable/2024.2
+masakari_dashboard_git_install_branch: 03c1ddc1db90e37cbf13082d2ebc49e400d4b748
+masakari_dashboard_git_track_branch: master
## Horizon Trove dashboard plugin
trove_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/trove-dashboard"
-trove_dashboard_git_install_branch: 3f2557b448ae43225e299c8c3137727eeb2b751c
-trove_dashboard_git_track_branch: stable/2024.2
+trove_dashboard_git_install_branch: 055a1a819fe1f2b537e7e3a7389bded47548bfec
+trove_dashboard_git_track_branch: master
## Horizon Octavia dashboard plugin
octavia_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/octavia-dashboard"
-octavia_dashboard_git_install_branch: 1d4b034669c819217a0f58a394dae4340661bdeb
-octavia_dashboard_git_track_branch: stable/2024.2
+octavia_dashboard_git_install_branch: f8655467ccf4c093f6fb8772acdf89ae59c132bc
+octavia_dashboard_git_track_branch: master
## Horizon Neutron VPNaaS dashboard plugin
neutron_vpnaas_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-vpnaas-dashboard"
-neutron_vpnaas_dashboard_git_install_branch: 6207d9a20b2f3c53a50d767a364aa8c448a2c923
-neutron_vpnaas_dashboard_git_track_branch: stable/2024.2
+neutron_vpnaas_dashboard_git_install_branch: 159f688ee4eafe252a833bdc5eea1df5036d8311
+neutron_vpnaas_dashboard_git_track_branch: master
## 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_track_branch: stable/2024.2
+neutron_fwaas_dashboard_git_install_branch: 284953b0a86530eaaf319f8858bf46dce50ae93d
+neutron_fwaas_dashboard_git_track_branch: master
diff --git a/inventory/group_vars/ironic_all/source_git.yml b/inventory/group_vars/ironic_all/source_git.yml
index b17e6ed3c3..7b56fe7fbd 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.11.2024 ###
+### HEAD as of 28.11.2024 ###
## Ironic service
ironic_git_repo: "{{ openstack_opendev_base_url }}/openstack/ironic"
-ironic_git_install_branch: 17914538dfd1657cd9ba7e44ea84d9a5c8a1ae1a
-ironic_git_track_branch: stable/2024.2
+ironic_git_install_branch: 9a2c8084c298f079aae05dc14cd0cb75995b6b2e
+ironic_git_track_branch: master
## Ironic inspector service
ironic_inspector_git_repo: "{{ openstack_opendev_base_url }}/openstack/ironic-inspector"
-ironic_inspector_git_install_branch: 5a0f2506dc2fce3af4e3b12e5a1c53ca879ae716
-ironic_inspector_git_track_branch: stable/2024.2
+ironic_inspector_git_install_branch: eb614d50812465cbe5081568ca50b9bf6f8bb741
+ironic_inspector_git_track_branch: master
diff --git a/inventory/group_vars/keystone_all/source_git.yml b/inventory/group_vars/keystone_all/source_git.yml
index 1f63e7558d..6e4ef74363 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 28.11.2024 ###
## Keystone service
keystone_git_repo: "{{ openstack_opendev_base_url }}/openstack/keystone"
-keystone_git_install_branch: 47891f4ae8fd7876e5a7657f58c32c371feeddc3
-keystone_git_track_branch: stable/2024.2
+keystone_git_install_branch: 516a341b90666e671ec9f4d3ab5b234bd5061165
+keystone_git_track_branch: master
diff --git a/inventory/group_vars/magnum_all/source_git.yml b/inventory/group_vars/magnum_all/source_git.yml
index 07529da2ee..ff0e03893a 100644
--- a/inventory/group_vars/magnum_all/source_git.yml
+++ b/inventory/group_vars/magnum_all/source_git.yml
@@ -17,5 +17,5 @@
## Magnum service
magnum_git_repo: "{{ openstack_opendev_base_url }}/openstack/magnum"
-magnum_git_install_branch: 71729a8d716ef7cd6a869408e35d60e96bc125d8
-magnum_git_track_branch: stable/2024.2
+magnum_git_install_branch: 00ba1565852f0c112bb19940f8a6258ff1341dee
+magnum_git_track_branch: master
diff --git a/inventory/group_vars/manila_all/source_git.yml b/inventory/group_vars/manila_all/source_git.yml
index 10ea378bc1..ffc66bdfc2 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 28.11.2024 ###
## Manila service
manila_git_repo: "{{ openstack_opendev_base_url }}/openstack/manila"
-manila_git_install_branch: 052e324e26b6ebdc4b8e011df9f41b43f1cea09b
-manila_git_track_branch: stable/2024.2
+manila_git_install_branch: 7ba78bf5980ea39cc9463e57f063c3a821cae679
+manila_git_track_branch: master
diff --git a/inventory/group_vars/masakari_all/source_git.yml b/inventory/group_vars/masakari_all/source_git.yml
index f21308bd00..f2c613a1a0 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 30.09.2024 ###
+### HEAD as of 28.11.2024 ###
## Masakari service
masakari_git_repo: "{{ openstack_opendev_base_url }}/openstack/masakari"
-masakari_git_install_branch: 4108774b8b8f9e04859b615d2892678a9c7ef3ed
-masakari_git_track_branch: stable/2024.2
+masakari_git_install_branch: 4bba1d67b41b62b52fed17c8b896a57b9a026ef7
+masakari_git_track_branch: master
## Masakari monitors services
masakari_monitors_git_repo: "{{ openstack_opendev_base_url }}/openstack/masakari-monitors"
-masakari_monitors_git_install_branch: d7ab72905c4ce65726b00aad15638f6c4c2bff72
-masakari_monitors_git_track_branch: stable/2024.2
+masakari_monitors_git_install_branch: 21a78c65d3e0536500ab55a7868c1edb99131b67
+masakari_monitors_git_track_branch: master
diff --git a/inventory/group_vars/mistral_all/source_git.yml b/inventory/group_vars/mistral_all/source_git.yml
index 6e1afb571a..82063d3d65 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 30.09.2024 ###
+### HEAD as of 28.11.2024 ###
## Mistral service
mistral_git_repo: "{{ openstack_opendev_base_url }}/openstack/mistral"
-mistral_git_install_branch: c4d32f8ae4c56955a97031f087b8e269ec8e45ab
-mistral_git_track_branch: stable/2024.2
+mistral_git_install_branch: a25d9c8c583a7bbf46ccefbe9e4bee97d36e140b
+mistral_git_track_branch: master
mistral_extra_git_repo: "{{ openstack_opendev_base_url }}/openstack/mistral-extra"
-mistral_extra_git_install_branch: 6f0444d0fe40ad6189c633c74fadd46dcf03a2c0
-mistral_extra_git_track_branch: stable/2024.2
+mistral_extra_git_install_branch: 6c8492d4ee341136db10c3873fc2605a44feb9fd
+mistral_extra_git_track_branch: master
diff --git a/inventory/group_vars/murano_all/haproxy_service.yml b/inventory/group_vars/murano_all/haproxy_service.yml
deleted file mode 100644
index 7bbc27195d..0000000000
--- a/inventory/group_vars/murano_all/haproxy_service.yml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# Copyright 2023, Cleura AB
-#
-# 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.
-
-haproxy_murano_service:
- haproxy_service_name: murano
- haproxy_backend_nodes: "{{ groups['murano_all'] | default([]) }}"
- haproxy_ssl: "{{ haproxy_ssl }}"
- haproxy_ssl_all_vips: "{{ haproxy_ssl_all_vips }}"
- haproxy_port: 8082
- haproxy_balance_type: http
- haproxy_backend_httpcheck_options:
- - 'send hdr User-Agent "osa-haproxy-healthcheck" meth GET uri /v1'
- - "expect status 401"
- haproxy_backend_ssl: "{{ murano_backend_ssl | default(openstack_service_backend_ssl) }}"
- haproxy_backend_ca: "{{ murano_haproxy_backend_ca | default(openstack_haproxy_backend_ca) }}"
- haproxy_accept_both_protocols: "{{ murano_accept_both_protocols | default(openstack_service_accept_both_protocols) }}"
- haproxy_service_enabled: "{{ groups['murano_all'] is defined and groups['murano_all'] | length > 0 }}"
-
-murano_haproxy_services:
- - "{{ haproxy_murano_service | combine(haproxy_murano_service_overrides | default({})) }}"
diff --git a/inventory/group_vars/neutron_all/source_git.yml b/inventory/group_vars/neutron_all/source_git.yml
index cd43db8972..bdc2ff151b 100644
--- a/inventory/group_vars/neutron_all/source_git.yml
+++ b/inventory/group_vars/neutron_all/source_git.yml
@@ -17,32 +17,32 @@
## Neutron service
neutron_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron"
-neutron_git_install_branch: 5cdeab2bd48129375bef845aac3d8c59f24d3e0e
-neutron_git_track_branch: stable/2024.2
+neutron_git_install_branch: 58993aca35332ced65ab03cd1b0e628f8c7b2b4b
+neutron_git_track_branch: master
neutron_vpnaas_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-vpnaas"
-neutron_vpnaas_git_install_branch: 990e478b1e6db459b6cb9aec53ce808e2957bb65
-neutron_vpnaas_git_track_branch: stable/2024.2
+neutron_vpnaas_git_install_branch: 2c644d3a5acc16eab58b623b0abf1e479a250a32
+neutron_vpnaas_git_track_branch: master
neutron_fwaas_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-fwaas"
-neutron_fwaas_git_install_branch: 7d40be7362ceafe39774e9dcd388863dff153d2e
-neutron_fwaas_git_track_branch: stable/2024.2
+neutron_fwaas_git_install_branch: 1d0a199682bd65cbf3e8c578620a09e87f3eb5e9
+neutron_fwaas_git_track_branch: master
neutron_dynamic_routing_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-dynamic-routing"
-neutron_dynamic_routing_git_install_branch: 1d3ecd2cf3ebc82267406d59e06f3f3b97ffdcd4
-neutron_dynamic_routing_git_track_branch: stable/2024.2
+neutron_dynamic_routing_git_install_branch: c7951ae90c16f036b9bb7ef5eef125eabedd3e02
+neutron_dynamic_routing_git_track_branch: master
networking_bgpvpn_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-bgpvpn"
-networking_bgpvpn_git_install_branch: d033c3722039e1a2477e2569ef2194ca0ae69bf7
-networking_bgpvpn_git_track_branch: stable/2024.2
+networking_bgpvpn_git_install_branch: 3670e2b978651fbbf5af13132a62acc855b512be
+networking_bgpvpn_git_track_branch: master
networking_sfc_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-sfc"
-networking_sfc_git_install_branch: 2e64dc0f7f9893c83d30878b95df6edca4d25cb9
-networking_sfc_git_track_branch: stable/2024.2
+networking_sfc_git_install_branch: f5fd80d4cf01e55232f43883a61a74bd3c98fd0d
+networking_sfc_git_track_branch: master
networking_generic_switch_git_repo: "{{ openstack_opendev_base_url}}/openstack/networking-generic-switch"
-networking_generic_switch_git_install_branch: 58e5d5039e6bddaad5e8a1802d44aec92b71f14f
-networking_generic_switch_git_track_branch: stable/2024.2
+networking_generic_switch_git_install_branch: ced747b10e5ab7797f82a9306614c866b4398e4f
+networking_generic_switch_git_track_branch: master
networking_nsx_git_repo: "{{ openstack_opendev_base_url }}/x/vmware-nsx"
networking_nsx_git_install_branch: 715cb5fc1174b9226f043e49ffd389add44f070a
@@ -53,9 +53,9 @@ networking_nsxlib_git_install_branch: c8a80f7e6f74f4c87311d4e58f5e122f209dd308
networking_nsxlib_git_track_branch: master
networking_baremetal_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-baremetal"
-networking_baremetal_git_install_branch: 1fba63ce21619d3fe70117c6679e53629c612bc1
-networking_baremetal_git_track_branch: stable/2024.2
+networking_baremetal_git_install_branch: d97cb6bad48e26ce70fe8795290c6384249d4661
+networking_baremetal_git_track_branch: master
networking_ovn_bgp_git_repo: "{{ openstack_opendev_base_url }}/openstack/ovn-bgp-agent"
-networking_ovn_bgp_git_install_branch: 02b7a8efb0189b857746f9f50cb5983df49b893d
-networking_ovn_bgp_git_track_branch: stable/2024.2
+networking_ovn_bgp_git_install_branch: faf71abadd5a9fb8dd1227ffcc877d759c0850ab
+networking_ovn_bgp_git_track_branch: master
diff --git a/inventory/group_vars/nova_all/source_git.yml b/inventory/group_vars/nova_all/source_git.yml
index 051e9e1377..5ac923f65f 100644
--- a/inventory/group_vars/nova_all/source_git.yml
+++ b/inventory/group_vars/nova_all/source_git.yml
@@ -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_track_branch: stable/2024.2
+nova_git_install_branch: 54534fbcb2f736d11a3c7004c7c674125dc8ba60
+nova_git_track_branch: master
diff --git a/inventory/group_vars/octavia_all/source_git.yml b/inventory/group_vars/octavia_all/source_git.yml
index a3acec4894..1538a3503e 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 28.11.2024 ###
## Octavia service
octavia_git_repo: "{{ openstack_opendev_base_url }}/openstack/octavia"
-octavia_git_install_branch: 7aa08d17ffc93596a58194bd3ba0acaaddd25e3a
-octavia_git_track_branch: stable/2024.2
+octavia_git_install_branch: 3aaff5e3f7c857f253edf18bac432a32dc15a325
+octavia_git_track_branch: master
## 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_track_branch: stable/2024.2
+octavia_ovn_octavia_provider_git_install_branch: 1c04edc3b62400db462d95e1b3bf62928d58d22f
+octavia_ovn_octavia_provider_git_track_branch: master
diff --git a/inventory/group_vars/placement_all/source_git.yml b/inventory/group_vars/placement_all/source_git.yml
index 449eca768b..6ecfd01a70 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 28.11.2024 ###
## Placement service
placement_git_repo: "{{ openstack_opendev_base_url }}/openstack/placement"
-placement_git_install_branch: 901dc8274a3198c38bd0faa515c729903d5d1e0d
-placement_git_track_branch: stable/2024.2
+placement_git_install_branch: 7dfcca6d3d45a2d0667abc6d9f6d2992a3d83662
+placement_git_track_branch: master
diff --git a/inventory/group_vars/sahara_all/haproxy_service.yml b/inventory/group_vars/sahara_all/haproxy_service.yml
deleted file mode 100644
index b59a873b34..0000000000
--- a/inventory/group_vars/sahara_all/haproxy_service.yml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# Copyright 2023, Cleura AB
-#
-# 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.
-
-haproxy_sahara_api_service:
- haproxy_service_name: sahara_api
- haproxy_backend_nodes: "{{ groups['sahara_api'] | default([]) }}"
- haproxy_ssl: "{{ haproxy_ssl }}"
- haproxy_ssl_all_vips: "{{ haproxy_ssl_all_vips }}"
- haproxy_balance_alg: source
- haproxy_port: 8386
- haproxy_balance_type: http
- haproxy_backend_httpcheck_options:
- - 'send hdr User-Agent "osa-haproxy-healthcheck" meth GET'
- haproxy_backend_ssl: "{{ sahara_backend_ssl | default(openstack_service_backend_ssl) }}"
- haproxy_backend_ca: "{{ sahara_haproxy_backend_ca | default(openstack_haproxy_backend_ca) }}"
- haproxy_accept_both_protocols: "{{ sahara_accept_both_protocols | default(openstack_service_accept_both_protocols) }}"
- haproxy_service_enabled: "{{ groups['sahara_api'] is defined and groups['sahara_api'] | length > 0 }}"
-
-sahara_haproxy_services:
- - "{{ haproxy_sahara_api_service | combine(haproxy_sahara_api_service_overrides | default({})) }}"
diff --git a/inventory/group_vars/senlin_all/haproxy_service.yml b/inventory/group_vars/senlin_all/haproxy_service.yml
deleted file mode 100644
index f1015db8e5..0000000000
--- a/inventory/group_vars/senlin_all/haproxy_service.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-# Copyright 2023, Cleura AB
-#
-# 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.
-
-haproxy_senlin_api_service:
- haproxy_service_name: senlin_api
- haproxy_backend_nodes: "{{ groups['senlin_api'] | default([]) }}"
- haproxy_ssl: "{{ haproxy_ssl }}"
- haproxy_ssl_all_vips: "{{ haproxy_ssl_all_vips }}"
- haproxy_port: 8778
- haproxy_balance_type: http
- haproxy_backend_httpcheck_options:
- - 'send hdr User-Agent "osa-haproxy-healthcheck" meth GET'
- haproxy_backend_ssl: "{{ senlin_backend_ssl | default(openstack_service_backend_ssl) }}"
- haproxy_backend_ca: "{{ senlin_haproxy_backend_ca | default(openstack_haproxy_backend_ca) }}"
- haproxy_accept_both_protocols: "{{ senlin_accept_both_protocols | default(openstack_service_accept_both_protocols) }}"
- haproxy_service_enabled: "{{ groups['senlin_api'] is defined and groups['senlin_api'] | length > 0 }}"
-
-senlin_haproxy_services:
- - "{{ haproxy_senlin_api_service | combine(haproxy_senlin_api_service_overrides | default({})) }}"
diff --git a/inventory/group_vars/skyline_all/source_git.yml b/inventory/group_vars/skyline_all/source_git.yml
index 579613b20c..ec30fe29a6 100644
--- a/inventory/group_vars/skyline_all/source_git.yml
+++ b/inventory/group_vars/skyline_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 28.11.2024 ###
## Skyline service
skyline_git_repo: "{{ openstack_opendev_base_url }}/openstack/skyline-apiserver"
-skyline_git_install_branch: c8bf698666044bc05b92ddde7dc780fe90c1b538
-skyline_git_track_branch: stable/2024.2
+skyline_git_install_branch: 5b33b76184beca59920ed70c63d1b33bd1a8e479
+skyline_git_track_branch: master
skyline_console_git_repo: "{{ openstack_opendev_base_url }}/openstack/skyline-console"
skyline_console_git_install_branch: 5.0.0.0rc2
diff --git a/inventory/group_vars/swift_all/source_git.yml b/inventory/group_vars/swift_all/source_git.yml
index a33964e396..753609ad98 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 28.11.2024 ###
## Swift service
swift_git_repo: "{{ openstack_opendev_base_url }}/openstack/swift"
-swift_git_install_branch: 27503ac2df5cb77b5fdf29196e555178ddbfdef7
-swift_git_track_branch: stable/2024.2
+swift_git_install_branch: 0d9ea8d9bd00716483e812afbbd9324881c80bc9
+swift_git_track_branch: master
diff --git a/inventory/group_vars/tacker_all/source_git.yml b/inventory/group_vars/tacker_all/source_git.yml
index f91867a8e1..a88d2d1a65 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 30.09.2024 ###
+### HEAD as of 28.11.2024 ###
## Tacker service
tacker_git_repo: "{{ openstack_opendev_base_url }}/openstack/tacker"
-tacker_git_install_branch: fa641793f4dccbc7ad49c071535d7dc0eb4c428a
-tacker_git_track_branch: stable/2024.2
+tacker_git_install_branch: 7cb7070df4d73f5e6cc21c54e91a66b4b7c12269
+tacker_git_track_branch: master
diff --git a/inventory/group_vars/trove_all/source_git.yml b/inventory/group_vars/trove_all/source_git.yml
index 35d7e48199..cd16f5caeb 100644
--- a/inventory/group_vars/trove_all/source_git.yml
+++ b/inventory/group_vars/trove_all/source_git.yml
@@ -17,5 +17,5 @@
## Trove service
trove_git_repo: "{{ openstack_opendev_base_url }}/openstack/trove"
-trove_git_install_branch: 4c191c30322a6fac2acfe6743daf151630bf8480
-trove_git_track_branch: stable/2024.2
+trove_git_install_branch: 44c96d9acb4eb4e52716f0eebca44cae8208382a
+trove_git_track_branch: master
diff --git a/inventory/group_vars/utility_all/source_git.yml b/inventory/group_vars/utility_all/source_git.yml
index b2a942c0d5..f7b3080a24 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 03.09.2024 ###
+### HEAD as of 28.11.2024 ###
tempest_git_repo: "{{ openstack_opendev_base_url }}/openstack/tempest"
-tempest_git_install_branch: f6bb9d1e4b30ac11132023d11c36f1fb48b2934a
-tempest_git_track_branch: None
+tempest_git_install_branch: e7b104c23cd2e1ac069bf55fb5e94a582534be81
+tempest_git_track_branch: master
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: None
+tempest_plugin_barbican_git_install_branch: 6e35158e0965bc53d22285da4f622ea8fd127a66
+tempest_plugin_barbican_git_track_branch: master
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: None
+tempest_plugin_blazar_git_install_branch: 6350fdfc87dae68571e3344289a88d45a07f535a
+tempest_plugin_blazar_git_track_branch: master
tempest_plugin_cinder_git_repo: "{{ openstack_opendev_base_url }}/openstack/cinder-tempest-plugin"
-tempest_plugin_cinder_git_install_branch: 1aa0a56fca85ce23343950431e28f41c4fa811c5
-tempest_plugin_cinder_git_track_branch: None
+tempest_plugin_cinder_git_install_branch: dfde7d5e9f5082a72152ee21aff9c94fe641a31a
+tempest_plugin_cinder_git_track_branch: master
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: None
+tempest_plugin_cloudkitty_git_install_branch: 25161af70d69d320ad3acb4054d767e10fa49c38
+tempest_plugin_cloudkitty_git_track_branch: master
tempest_plugin_designate_git_repo: "{{ openstack_opendev_base_url }}/openstack/designate-tempest-plugin"
-tempest_plugin_designate_git_install_branch: bb1996d7a87c7a68262506b8d5185b81b436e4c4
-tempest_plugin_designate_git_track_branch: None
+tempest_plugin_designate_git_install_branch: 070e4cb6bf2768e6e12a967d6674fd3707901853
+tempest_plugin_designate_git_track_branch: master
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: None
+tempest_plugin_glance_git_install_branch: 2a2e4e27b6f078e35b65554562b5367d513436d4
+tempest_plugin_glance_git_track_branch: master
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: None
+tempest_plugin_heat_git_install_branch: 363bba549f3cc2c4d1deb85f2d148eff6046f939
+tempest_plugin_heat_git_track_branch: master
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: None
+tempest_plugin_ironic_git_install_branch: b6c0572a8aeec645774c84d3befd5a5f9abd185b
+tempest_plugin_ironic_git_track_branch: master
tempest_plugin_keystone_git_repo: "{{ openstack_opendev_base_url }}/openstack/keystone-tempest-plugin"
tempest_plugin_keystone_git_install_branch: 8ac8c4ff9cf435d3938eb9e28ffc2167d8d98bb3
-tempest_plugin_keystone_git_track_branch: None
+tempest_plugin_keystone_git_track_branch: master
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: None
+tempest_plugin_magnum_git_install_branch: 09584dbfb310448e18ee49268a4f56bb5dd567b9
+tempest_plugin_magnum_git_track_branch: master
tempest_plugin_manila_git_repo: "{{ openstack_opendev_base_url }}/openstack/manila-tempest-plugin"
-tempest_plugin_manila_git_install_branch: b758fb49cc8c9d56fa83f910f3462a845eec1b1b
-tempest_plugin_manila_git_track_branch: None
+tempest_plugin_manila_git_install_branch: 774696b7d6fb87f1bb9622df3b892fae12fba1fd
+tempest_plugin_manila_git_track_branch: master
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: None
+tempest_plugin_murano_git_track_branch: master
tempest_plugin_neutron_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-tempest-plugin"
-tempest_plugin_neutron_git_install_branch: 7c4473d55c31f147154cc60487859e5db05ab5e9
-tempest_plugin_neutron_git_track_branch: None
+tempest_plugin_neutron_git_install_branch: 5e33282fc2397ba438a5b5ad4233a46701e730f4
+tempest_plugin_neutron_git_track_branch: master
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: None
+tempest_plugin_novajoin_git_track_branch: master
tempest_plugin_octavia_git_repo: "{{ openstack_opendev_base_url }}/openstack/octavia-tempest-plugin"
-tempest_plugin_octavia_git_install_branch: b85b33e2b9ce12e659c66ee8f8449180d7a9d532
-tempest_plugin_octavia_git_track_branch: None
+tempest_plugin_octavia_git_install_branch: 4af9bae253bc7e8a1fde4f84d45aecbb825f10df
+tempest_plugin_octavia_git_track_branch: master
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: None
+tempest_plugin_senlin_git_track_branch: master
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: None
+tempest_plugin_sahara_git_track_branch: master
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: None
+tempest_plugin_telemetry_git_install_branch: 975887d0f12dbb157f99dba96dba4c38b06d0153
+tempest_plugin_telemetry_git_track_branch: master
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: None
+tempest_plugin_trove_git_track_branch: master
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: None
+tempest_plugin_zaqar_git_install_branch: cc57df23c1e884b33d06ab245f9aedf2ac368471
+tempest_plugin_zaqar_git_track_branch: master
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: None
+tempest_plugin_zun_git_track_branch: master
rally_openstack_git_repo: "{{ openstack_opendev_base_url }}/openstack/rally-openstack"
-rally_openstack_git_install_branch: 7a45064547588d83fcad1f297c0494d725a2af83
-rally_openstack_git_track_branch: None
+rally_openstack_git_install_branch: 85e56595d39b5c44f51db0945f84565cd703a6c0
+rally_openstack_git_track_branch: master
diff --git a/inventory/group_vars/zun_all/source_git.yml b/inventory/group_vars/zun_all/source_git.yml
index 716a7172db..854d9e366a 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 30.09.2024 ###
+### HEAD as of 28.11.2024 ###
## Zun service
zun_git_repo: "{{ openstack_opendev_base_url }}/openstack/zun"
-zun_git_install_branch: e5a1e10a4d95684e26b71084239f82af4bd5b41d
-zun_git_track_branch: stable/2024.2
+zun_git_install_branch: 5c5e1063edb452418cfe5b9dc452016171738312
+zun_git_track_branch: master
## Zun kuryr service
zun_kuryr_git_repo: "{{ openstack_opendev_base_url }}/openstack/kuryr-libnetwork"
-zun_kuryr_git_install_branch: dccf32dcd47d50aa7f734e7ef9973b4446f1d26c
-zun_kuryr_git_track_branch: stable/2024.2
+zun_kuryr_git_install_branch: 106065b60b34c0fee11f226d01d31f8bc4a3a68d
+zun_kuryr_git_track_branch: master
## Zun kuryr library
zun_kuryr_lib_git_repo: "{{ openstack_opendev_base_url }}/openstack/kuryr"
-zun_kuryr_lib_git_install_branch: 324d408c58c1a1daa036cfcf93606300ef1b873d
-zun_kuryr_lib_git_track_branch: stable/2024.2
+zun_kuryr_lib_git_install_branch: 2b16f57d9bf6059ae769b7892f9feb828865d50e
+zun_kuryr_lib_git_track_branch: master
diff --git a/scripts/gate-check-commit.sh b/scripts/gate-check-commit.sh
index cac2c03ed9..48db00cca8 100755
--- a/scripts/gate-check-commit.sh
+++ b/scripts/gate-check-commit.sh
@@ -65,7 +65,7 @@ if [[ "${ACTION}" =~ "upgrade" ]]; then
# The branch prefix will also change from 'stable/' to 'unmaintained/'
# in the future, so determine the branch prefix dynamically
UPGRADE_ACTION_ARRAY=(${ACTION//_/ })
- export UPGRADE_SOURCE_RELEASE=${UPGRADE_ACTION_ARRAY[1]:-'2024.1'}
+ export UPGRADE_SOURCE_RELEASE=${UPGRADE_ACTION_ARRAY[1]:-'2024.2'}
export UPGRADE_SOURCE_BRANCH_PREFIX=$(git branch -r --list 'origin/*' | grep $UPGRADE_SOURCE_RELEASE | sort | tail -n 1 | cut -d '/' -f 2)
export UPGRADE_SOURCE_BRANCH=${UPGRADE_SOURCE_BRANCH:-$UPGRADE_SOURCE_BRANCH_PREFIX/$UPGRADE_SOURCE_RELEASE}
diff --git a/scripts/run-upgrade.sh b/scripts/run-upgrade.sh
index cce4f1f685..0eeb1482d8 100755
--- a/scripts/run-upgrade.sh
+++ b/scripts/run-upgrade.sh
@@ -31,10 +31,10 @@ export SCRIPTS_PATH="$(dirname "$(readlink -f "${0}")")"
export MAIN_PATH="$(dirname "${SCRIPTS_PATH}")"
# The expected source series names
-export SUPPORTED_SOURCE_SERIES=("2024.1")
+export SUPPORTED_SOURCE_SERIES=("2024.1", "2024.2")
# The expected target series name
-export TARGET_SERIES="2024.2"
+export TARGET_SERIES="2025.1"
# The expected OSA config dir
export OSA_CONFIG_DIR="${OSA_CONFIG_DIR:-/etc/openstack_deploy}"