diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml
index aac76f6710..727de97afe 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: 1c5580e6485843d49edcba0dda85d09345fe07e3
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: frrouting
scm: git
src: https://opendev.org/openstack/ansible-role-frrouting
- version: 8af8a9a0aecb683506ffff61440b7d03bc61f495
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: pki
src: https://opendev.org/openstack/ansible-role-pki
scm: git
- version: d084fe5cc465a6c938bebb8c67a73fff53d52679
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: python_venv_build
src: https://opendev.org/openstack/ansible-role-python_venv_build
scm: git
- version: c1ccf348ceb6cc61d34c81c27111f19b2201612e
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: qdrouterd
scm: git
src: https://opendev.org/openstack/ansible-role-qdrouterd
- version: 6db8b2c71d664cfea0e60198600c74a9930ac99b
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: systemd_mount
src: https://opendev.org/openstack/ansible-role-systemd_mount
scm: git
- version: c3b8f830a0a8a19bdfc7273efdef6052416ce001
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: systemd_networkd
src: https://opendev.org/openstack/ansible-role-systemd_networkd
scm: git
- version: ad62bd2799eacebd44edfc9d00bbc2c034e0b9c3
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: systemd_service
src: https://opendev.org/openstack/ansible-role-systemd_service
scm: git
- version: 88697e28783bea43c84607fe1727a8ca9e96c13f
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: uwsgi
src: https://opendev.org/openstack/ansible-role-uwsgi
scm: git
- version: c1b0b6d7baa55412f6ae2472a7949095cf30a395
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: zookeeper
src: https://opendev.org/openstack/ansible-role-zookeeper
scm: git
- version: 4ad8f8d2d389deb9fbff65fd8dd565f13a1625a5
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: apt_package_pinning
scm: git
src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning
- version: 8ad24da652119ae7bc4e490299275fde6e7effb7
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: ceph_client
scm: git
src: https://opendev.org/openstack/openstack-ansible-ceph_client
- version: bd5edda3f51cf73684ce84e0df93cf08490a6ae2
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: galera_server
scm: git
src: https://opendev.org/openstack/openstack-ansible-galera_server
- version: 7c248a441cbd21744f94ff0a88a41bba1412cde0
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: haproxy_server
scm: git
src: https://opendev.org/openstack/openstack-ansible-haproxy_server
- version: e589743829df1f0e6d24f3188768c6e40076b6f8
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: lxc_container_create
scm: git
src: https://opendev.org/openstack/openstack-ansible-lxc_container_create
- version: c082c8bdaddc3e4665eb10572bc3c02abe414d1c
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: lxc_hosts
scm: git
src: https://opendev.org/openstack/openstack-ansible-lxc_hosts
- version: 3725802c1a7ecbc5d63dc3a6963abd2ffc05e718
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: memcached_server
scm: git
src: https://opendev.org/openstack/openstack-ansible-memcached_server
- version: 30a9aee8c624ebbcf5175c1bc876a96b1908fc1c
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: openstack_hosts
scm: git
src: https://opendev.org/openstack/openstack-ansible-openstack_hosts
- version: efa59c4380b0cb319defc869e66580ae89a88a5d
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: openstack_openrc
scm: git
src: https://opendev.org/openstack/openstack-ansible-openstack_openrc
- version: cb5172191c60693db217d961464b73d139716ae7
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_adjutant
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_adjutant
- version: f01eda88ee00098159b33234cf66c92f546666f6
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_aodh
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_aodh
- version: 1407655106ed1f611e7c7f411580f3e5117aecaf
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_barbican
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_barbican
- version: c149eac9ef482f42894e902067500a9630783fe7
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_blazar
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_blazar
- version: 7c73bd99b45d0cdd57c311234535fb63ee1f0753
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_ceilometer
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_ceilometer
- version: 203ddf2c687afbc7d348983904b90ad458b343d5
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_cinder
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_cinder
- version: 11e71dda88988d6dff17db3cbef2193829207c24
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_cloudkitty
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_cloudkitty
- version: 59cedfa55f981d0162ee6e28808609caae59f490
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_designate
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_designate
- version: e9b1657a9c7d1302a673a8ae8dcc53b0beaad7ba
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_glance
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_glance
- version: e94c1124324c4b5eb21a3ff4043729b890533c87
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_gnocchi
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_gnocchi
- version: 7cce9921b400a65ddb7e8fc07d1753e2131246dd
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_heat
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_heat
- version: ac13ba67b41b00acc499155d36f328bdda3ea96b
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_horizon
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_horizon
- version: 9614a44c68783f1d96e86ee635eb4d56ffb24434
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_ironic
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_ironic
- version: c1ae180832de6b450c7f74901b1d943f2a12d63b
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_keystone
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_keystone
- version: 34dfc99559724f3deba959dc9c27d277d6d1a65d
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_magnum
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_magnum
- version: 8e9c485919aed8ca3b40ff00d6626654f2807408
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_manila
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_manila
- version: 1bf117029c2fd11a885e387eab0dd0a5f12b9fea
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_masakari
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_masakari
- version: d304eb2f4c37f0793cc827908df484be825e3183
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_mistral
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_mistral
- version: bdd918543af39f36cf7e3d16779df985ea5b2231
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_neutron
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_neutron
- version: 10534310270341ee7fbdce7ed30e23d198eb0909
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_nova
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_nova
- version: 01ffe69597b475b2b6f3f046128fa5873f73bbbc
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_octavia
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_octavia
- version: a5593c54a518ed90828318ea6ff60be3d30dafe8
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_placement
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_placement
- version: 0a8f3e75826b15ffdfb75822156dacb91dfa1d97
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_rally
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_rally
- version: 80fac9b3376c8e4fddd25345e89d1318c3986600
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_skyline
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_skyline
- version: afeec40d818dc08e726725db5d1e373b1de5a6af
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_swift
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_swift
- version: f0be5d7c1bc2af781b5b4b653bb06d28d6d6cf5b
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_tacker
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_tacker
- version: 00211d3799a95d460b1bdaecaa896903df78c5bc
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_tempest
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_tempest
- version: d7d7ded820e2cce3c33deb802199786f0e0603c9
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_trove
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_trove
- version: 71e3000c998438e22dbf5cade176aabfe0898083
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: os_zun
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_zun
- version: 733d3f40f4586a78b9d97fa9cc25dea5958fa9f5
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: rabbitmq_server
scm: git
src: https://opendev.org/openstack/openstack-ansible-rabbitmq_server
- version: b0fee214608a254821f7f3591a2be026cae691b6
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
- name: repo_server
scm: git
src: https://opendev.org/openstack/openstack-ansible-repo_server
- version: 4acac02792610018524056da1dd7fc5bc421346d
- trackbranch: stable/2024.1
+ version: master
+ trackbranch: master
shallow_since: '2024-06-03'
# External dependencies
- name: etcd
scm: git
src: https://github.com/noonedeadpunk/ansible-etcd
- version: de3b061e954d3259e0a48e2e55878f598ef3a9c1
+ version: master
trackbranch: master
shallow_since: '2023-04-11'
- name: keepalived
scm: git
src: https://github.com/evrardjp/ansible-keepalived
- version: a73191c2e49cc7ce1c4a17fd90ef460c76439e94
+ version: master
trackbranch: master
shallow_since: '2023-05-18'
- name: pacemaker_corosync
scm: git
src: https://github.com/noonedeadpunk/ansible-pacemaker-corosync
- version: 8218da4e0b0ea14aceae091782c83c588cc8139e
+ version: master
trackbranch: master
shallow_since: '2023-10-19'
- name: resolvconf
scm: git
src: https://github.com/logan2211/ansible-resolvconf
- version: f7f694b3dd4361e364dccb4ce94e6510727fca2f
+ version: master
trackbranch: master
shallow_since: '2021-03-31'
- name: unbound
scm: git
src: https://github.com/noonedeadpunk/ansible-role-unbound
- version: 26abb238925dec80707ef7e4b869b3c5e48d4f7b
+ version: master
trackbranch: master
shallow_since: '2023-02-09'
- name: ceph-ansible
scm: git
src: https://github.com/ceph/ceph-ansible
- version: 69a990392a94b59e1404eaeae7d6dfb5217ca71c
+ version: stable-7.0
trackbranch: stable-7.0
shallow_since: '2024-05-15'
diff --git a/deploy-guide/source/conf.py b/deploy-guide/source/conf.py
index 5aba29a572..877747693f 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 = '2023.1'
-current_series_name = '2023.2'
+previous_series_name = '2024.1'
+current_series_name = '2024.2'
# 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 716bdd8fdc..83b142cead 100644
--- a/doc/source/admin/upgrades/os-compatibility-matrix.html
+++ b/doc/source/admin/upgrades/os-compatibility-matrix.html
@@ -98,4 +98,23 @@
| ✘ |
E |
+
+ | 2024.2 (Dalmatian)
+ | source |
+ ✘ |
+ ✔ |
+ ✔ |
+ ✔ |
+ ✔ |
+ ✔ |
+
+
+ | distro |
+ ✘ |
+ E |
+ E |
+ ✘ |
+ ✘ |
+ E |
+
diff --git a/doc/source/conf.py b/doc/source/conf.py
index b938d99673..ce08d14097 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 = '2023.2'
-previous_slurp_name = '2023.1'
-current_series_name = '2024.1'
+previous_series_name = '2024.1'
+previous_slurp_name = None
+current_series_name = '2024.2'
# General information about the project.
author = 'OpenStack-Ansible Contributors'
diff --git a/doc/source/index.rst b/doc/source/index.rst
index bf07eafced..79144b480c 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.1 (Caracal): Under development
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+2024.2 (Dalmatian): Under development
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-OpenStack-Ansible 2024.1 (Caracal) is currently Under Development.
+OpenStack-Ansible 2024.2 (Dalmatian) is currently Under Development.
.. toctree::
:maxdepth: 1
@@ -25,11 +25,25 @@ OpenStack-Ansible 2024.1 (Caracal) is currently Under Development.
contributor/index
reference/index
+2024.1 (Caracal): Maintained
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+OpenStack-Ansible 2024.1 (Bobcat) was first released with the 29.0.0 tag on
+June 6, 2024.
+
+* `OpenStack-Ansible 2024.1 Documentation`_
+
+* `OpenStack-Ansible 2024.1 series release notes`_
+
+.. _OpenStack-Ansible 2024.1 Documentation: https://docs.openstack.org/openstack-ansible/2024.1/
+.. _OpenStack-Ansible 2024.1 series release notes: https://docs.openstack.org/releasenotes/openstack-ansible/2024.1.html
+
+
2023.2 (Bobcat): Maintained
~~~~~~~~~~~~~~~~~~~~~~~~~~~
OpenStack-Ansible 2023.2 (Bobcat) was first released with the 28.0.0 tag on
-7 December 2023.
+December 7, 2023.
* `OpenStack-Ansible 2023.2 Documentation`_
@@ -43,7 +57,7 @@ OpenStack-Ansible 2023.2 (Bobcat) was first released with the 28.0.0 tag on
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
OpenStack-Ansible 2023.1 (Antelope) was first released with the 27.0.0 tag on
-1 June 2023.
+June 1, 2023.
* `OpenStack-Ansible 2023.1 Documentation`_
@@ -52,11 +66,10 @@ OpenStack-Ansible 2023.1 (Antelope) was first released with the 27.0.0 tag on
.. _OpenStack-Ansible 2023.1 Documentation: https://docs.openstack.org/openstack-ansible/2023.1/
.. _OpenStack-Ansible 2023.1 series release notes: https://docs.openstack.org/releasenotes/openstack-ansible/2023.1.html
-Zed: Maintained
-~~~~~~~~~~~~~~~
+Zed: EOM (end-of-maintenance)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-OpenStack-Ansible Zed series was first released with the 26.0.0 tag on
-14 December 2022.
+OpenStack-Ansible Zed series was EOM-ed on June 6, 2024
* `OpenStack-Ansible Zed Documentation`_
diff --git a/inventory/group_vars/adjutant_all/source_git.yml b/inventory/group_vars/adjutant_all/source_git.yml
index bc256689dc..6abda333a6 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: 8deababd1b1639400485903d88d15252c0a14b6c
-adjutant_git_track_branch: stable/2024.1
+adjutant_git_track_branch: master
diff --git a/inventory/group_vars/all/source_git.yml b/inventory/group_vars/all/source_git.yml
index 9df940910b..ff778c292f 100644
--- a/inventory/group_vars/all/source_git.yml
+++ b/inventory/group_vars/all/source_git.yml
@@ -18,4 +18,4 @@
## Global Requirements
requirements_git_repo: "{{ openstack_opendev_base_url }}/openstack/requirements"
requirements_git_install_branch: 5c68165572da1c438fb98533fcb4f609f9e8d6b2
-requirements_git_track_branch: stable/2024.1
+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 4393e14a0d..ac33aa08d9 100644
--- a/inventory/group_vars/aodh_all/source_git.yml
+++ b/inventory/group_vars/aodh_all/source_git.yml
@@ -18,4 +18,4 @@
## Aodh service
aodh_git_repo: "{{ openstack_opendev_base_url }}/openstack/aodh"
aodh_git_install_branch: 523062f4aa62640d12f271d952e5308194245c3b
-aodh_git_track_branch: stable/2024.1
+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 fd91e912a0..029987540c 100644
--- a/inventory/group_vars/barbican_all/source_git.yml
+++ b/inventory/group_vars/barbican_all/source_git.yml
@@ -18,4 +18,4 @@
## Barbican service
barbican_git_repo: "{{ openstack_opendev_base_url }}/openstack/barbican"
barbican_git_install_branch: d99764e6112cedc6ca168a29fb0279dec2d94288
-barbican_git_track_branch: stable/2024.1
+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 a87824a8d0..273388cb8f 100644
--- a/inventory/group_vars/blazar_all/source_git.yml
+++ b/inventory/group_vars/blazar_all/source_git.yml
@@ -18,9 +18,9 @@
## Blazar service
blazar_git_repo: "{{ openstack_opendev_base_url }}/openstack/blazar"
blazar_git_install_branch: c58f857f49936a4b58ad635e4bd665bb46ee5432
-blazar_git_track_branch: stable/2024.1
+blazar_git_track_branch: master
## Blazar Nova Service
blazar_nova_git_repo: "{{ openstack_opendev_base_url }}/openstack/blazar-nova"
blazar_nova_git_install_branch: 134f568b1b1ef79b487154526e3dcb045c27d813
-blazar_nova_git_track_branch: stable/2024.1
+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 c41c841d64..735b79ddf2 100644
--- a/inventory/group_vars/ceilometer_all/source_git.yml
+++ b/inventory/group_vars/ceilometer_all/source_git.yml
@@ -18,4 +18,4 @@
## Ceilometer service
ceilometer_git_repo: "{{ openstack_opendev_base_url }}/openstack/ceilometer"
ceilometer_git_install_branch: bea425e9453f286f011c5c6cd631ac3cf17f722a
-ceilometer_git_track_branch: stable/2024.1
+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 4e1bbcf44f..8e7d1f802f 100644
--- a/inventory/group_vars/cinder_all/source_git.yml
+++ b/inventory/group_vars/cinder_all/source_git.yml
@@ -18,4 +18,4 @@
## Cinder service
cinder_git_repo: "{{ openstack_opendev_base_url }}/openstack/cinder"
cinder_git_install_branch: 0ff4262fba803152e94e32e0dc8e4a2e56fcb0f5
-cinder_git_track_branch: stable/2024.1
+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 758c6c342d..1b65e5d61e 100644
--- a/inventory/group_vars/cloudkitty_all/source_git.yml
+++ b/inventory/group_vars/cloudkitty_all/source_git.yml
@@ -18,4 +18,4 @@
## Cloudkitty service
cloudkitty_git_repo: "{{ openstack_opendev_base_url }}/openstack/cloudkitty"
cloudkitty_git_install_branch: 6641acb738c9376a532ae4d886397bc93374522a
-cloudkitty_git_track_branch: stable/2024.1
+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 ed259edbf5..071ba3cc1e 100644
--- a/inventory/group_vars/designate_all/source_git.yml
+++ b/inventory/group_vars/designate_all/source_git.yml
@@ -18,4 +18,4 @@
## Designate service
designate_git_repo: "{{ openstack_opendev_base_url }}/openstack/designate"
designate_git_install_branch: 72777e203ec6f09757ddcd90011013eeafab36c1
-designate_git_track_branch: stable/2024.1
+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 e01f7f264d..722b6148fb 100644
--- a/inventory/group_vars/glance_all/source_git.yml
+++ b/inventory/group_vars/glance_all/source_git.yml
@@ -18,4 +18,4 @@
## Glance service
glance_git_repo: "{{ openstack_opendev_base_url }}/openstack/glance"
glance_git_install_branch: eb3eb4ea269f608a7b534bb205f917309420cd51
-glance_git_track_branch: stable/2024.1
+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 a941c485cf..02a8f0aaee 100644
--- a/inventory/group_vars/heat_all/source_git.yml
+++ b/inventory/group_vars/heat_all/source_git.yml
@@ -18,4 +18,4 @@
## Heat service
heat_git_repo: "{{ openstack_opendev_base_url }}/openstack/heat"
heat_git_install_branch: 512052a0553cc3661aa850542a13466b07a0c5c6
-heat_git_track_branch: stable/2024.1
+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 526c25c854..0fd65218ed 100644
--- a/inventory/group_vars/horizon_all/source_git.yml
+++ b/inventory/group_vars/horizon_all/source_git.yml
@@ -18,12 +18,12 @@
## Horizon service
horizon_git_repo: "{{ openstack_opendev_base_url }}/openstack/horizon"
horizon_git_install_branch: dcaf0cc51fe998ca6de89a82a3cdadd26131830b
-horizon_git_track_branch: stable/2024.1
+horizon_git_track_branch: master
## Adjutant dashboard plugin
adjutant_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/adjutant-ui"
adjutant_dashboard_git_install_branch: 02dd3d73633cffd842e45dd23cd25ed3ea86c8ad
-adjutant_dashboard_git_track_branch: stable/2024.1
+adjutant_dashboard_git_track_branch: master
## Barbican dashboard plugin
barbican_dashboard_git_repo: "{{ openstack_opendev_base_url }}//openstack/barbican-ui"
@@ -33,32 +33,32 @@ 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: 6ed70436e51c75fb348597281ba772b26ebbfcf2
-cloudkitty_dashboard_git_track_branch: stable/2024.1
+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: ae09bd6477803c271c742fbd239c75cd3b7914b2
-designate_dashboard_git_track_branch: stable/2024.1
+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: 0f8ddbaec6fc01733e6ac7d709e7f36761330ede
-heat_dashboard_git_track_branch: stable/2024.1
+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: a50a6e491c85de91bc751a621082f9dac594dac2
-ironic_dashboard_git_track_branch: stable/2024.1
+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: e79a2177c8645ba50093896832626d5663c43931
-magnum_dashboard_git_track_branch: stable/2024.1
+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: bf89b7a2e07392a34c175c2c84facba8a153c9b4
-masakari_dashboard_git_track_branch: stable/2024.1
+masakari_dashboard_git_track_branch: master
## Horizon Murano dashboard plugin
murano_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/murano-dashboard"
@@ -73,9 +73,9 @@ sahara_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: 66dd6316f755a3d9297b9d67650f9cb89b60a43f
-trove_dashboard_git_track_branch: stable/2024.1
+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: 468c619bfc27b8734698571de12c06ab6ff6241a
-octavia_dashboard_git_track_branch: stable/2024.1
+octavia_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 70c0a6346f..60f72d5ae2 100644
--- a/inventory/group_vars/ironic_all/source_git.yml
+++ b/inventory/group_vars/ironic_all/source_git.yml
@@ -18,9 +18,9 @@
## Ironic service
ironic_git_repo: "{{ openstack_opendev_base_url }}/openstack/ironic"
ironic_git_install_branch: 910819efce326850bc5a4e1fe7fc5ac19301f8fa
-ironic_git_track_branch: stable/2024.1
+ironic_git_track_branch: master
## Ironic inspector service
ironic_inspector_git_repo: "{{ openstack_opendev_base_url }}/openstack/ironic-inspector"
ironic_inspector_git_install_branch: 5f72b87702843ffdae03795c1bd5b925a316d74e
-ironic_inspector_git_track_branch: stable/2024.1
+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 98198a120d..affd83217a 100644
--- a/inventory/group_vars/keystone_all/source_git.yml
+++ b/inventory/group_vars/keystone_all/source_git.yml
@@ -18,4 +18,4 @@
## Keystone service
keystone_git_repo: "{{ openstack_opendev_base_url }}/openstack/keystone"
keystone_git_install_branch: 2c8fd6cec862830725c98e00009ede00b85e18e7
-keystone_git_track_branch: stable/2024.1
+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 b4d2a9ef47..10c8637cd0 100644
--- a/inventory/group_vars/magnum_all/source_git.yml
+++ b/inventory/group_vars/magnum_all/source_git.yml
@@ -18,4 +18,4 @@
## Magnum service
magnum_git_repo: "{{ openstack_opendev_base_url }}/openstack/magnum"
magnum_git_install_branch: 239fa19ea9fd6df04f084053f1ae282ce60b6e32
-magnum_git_track_branch: stable/2024.1
+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 12b3443ec7..02df9a9b27 100644
--- a/inventory/group_vars/manila_all/source_git.yml
+++ b/inventory/group_vars/manila_all/source_git.yml
@@ -18,4 +18,4 @@
## Manila service
manila_git_repo: "{{ openstack_opendev_base_url }}/openstack/manila"
manila_git_install_branch: b46096fcdc99e890b1821d32e596e8455a1cfe9b
-manila_git_track_branch: stable/2024.1
+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 73a3156d5c..ab9ca7b1ec 100644
--- a/inventory/group_vars/masakari_all/source_git.yml
+++ b/inventory/group_vars/masakari_all/source_git.yml
@@ -18,9 +18,9 @@
## Masakari service
masakari_git_repo: "{{ openstack_opendev_base_url }}/openstack/masakari"
masakari_git_install_branch: 70ee6f13b3fbea7523b499abdbf22c7cc624b4ef
-masakari_git_track_branch: stable/2024.1
+masakari_git_track_branch: master
## Masakari monitors services
masakari_monitors_git_repo: "{{ openstack_opendev_base_url }}/openstack/masakari-monitors"
masakari_monitors_git_install_branch: 15b3a8ae96973b78b0213e4b5cd97ae5f8001680
-masakari_monitors_git_track_branch: stable/2024.1
+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 d21dec7ef0..157cdf10f0 100644
--- a/inventory/group_vars/mistral_all/source_git.yml
+++ b/inventory/group_vars/mistral_all/source_git.yml
@@ -18,8 +18,8 @@
## Mistral service
mistral_git_repo: "{{ openstack_opendev_base_url }}/openstack/mistral"
mistral_git_install_branch: 3c16d9d56431f9061db39f9451de1d772a382349
-mistral_git_track_branch: stable/2024.1
+mistral_git_track_branch: master
mistral_extra_git_repo: "{{ openstack_opendev_base_url }}/openstack/mistral-extra"
mistral_extra_git_install_branch: cebacf3e972de8dbd72d05c9563f60501cfbca78
-mistral_extra_git_track_branch: stable/2024.1
+mistral_extra_git_track_branch: master
diff --git a/inventory/group_vars/neutron_all/source_git.yml b/inventory/group_vars/neutron_all/source_git.yml
index 353a3d3946..2ee547fb17 100644
--- a/inventory/group_vars/neutron_all/source_git.yml
+++ b/inventory/group_vars/neutron_all/source_git.yml
@@ -18,27 +18,27 @@
## Neutron service
neutron_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron"
neutron_git_install_branch: 97e4713bb3898f9bf2bf2365f60c16785560e9a2
-neutron_git_track_branch: stable/2024.1
+neutron_git_track_branch: master
neutron_vpnaas_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-vpnaas"
neutron_vpnaas_git_install_branch: 297855d0c98de29092ef94ce6686c56eb9f6b422
-neutron_vpnaas_git_track_branch: stable/2024.1
+neutron_vpnaas_git_track_branch: master
neutron_dynamic_routing_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-dynamic-routing"
neutron_dynamic_routing_git_install_branch: 45a8b85abd36a9bff1cf786da13a5b69114854c4
-neutron_dynamic_routing_git_track_branch: stable/2024.1
+neutron_dynamic_routing_git_track_branch: master
networking_bgpvpn_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-bgpvpn"
networking_bgpvpn_git_install_branch: 90d4463d254c8c6f0273b105ed53b6632f78ce18
-networking_bgpvpn_git_track_branch: stable/2024.1
+networking_bgpvpn_git_track_branch: master
networking_sfc_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-sfc"
networking_sfc_git_install_branch: 69080506f2664c28068398d90b70df9e7332f256
-networking_sfc_git_track_branch: stable/2024.1
+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: b6bb46af9d56aae50e2afb17641289733f446a1b
-networking_generic_switch_git_track_branch: stable/2024.1
+networking_generic_switch_git_track_branch: master
networking_nsx_git_repo: "{{ openstack_opendev_base_url }}/x/vmware-nsx"
networking_nsx_git_install_branch: 715cb5fc1174b9226f043e49ffd389add44f070a
@@ -50,8 +50,8 @@ networking_nsxlib_git_track_branch: master
networking_baremetal_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-baremetal"
networking_baremetal_git_install_branch: 62ca32e80b77e23eb24d45d4a331ffddba3237cb
-networking_baremetal_git_track_branch: stable/2024.1
+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: 47c18ffaa450e91ffb8b1e03fd67ba3d1b493d9a
-networking_ovn_bgp_git_track_branch: stable/2024.1
+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 ce50bcb075..1c0e18cb52 100644
--- a/inventory/group_vars/nova_all/source_git.yml
+++ b/inventory/group_vars/nova_all/source_git.yml
@@ -38,4 +38,4 @@ spicehtml5_git_track_branch: master
## Nova service
nova_git_repo: "{{ openstack_opendev_base_url }}/openstack/nova"
nova_git_install_branch: e05b2a0ea32d86a24759c9421b4c000262ad9417
-nova_git_track_branch: stable/2024.1
+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 fa24d74c4d..ca17d65a8e 100644
--- a/inventory/group_vars/octavia_all/source_git.yml
+++ b/inventory/group_vars/octavia_all/source_git.yml
@@ -18,9 +18,9 @@
## Octavia service
octavia_git_repo: "{{ openstack_opendev_base_url }}/openstack/octavia"
octavia_git_install_branch: b8053b207e40b7b7bd4c35d38969b18514afab5e
-octavia_git_track_branch: stable/2024.1
+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: ad5f936ff7e29723bb3097ada71d6caf6add4494
-octavia_ovn_octavia_provider_git_track_branch: stable/2024.1
+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 e1e1b8f4ce..a4a72e3918 100644
--- a/inventory/group_vars/placement_all/source_git.yml
+++ b/inventory/group_vars/placement_all/source_git.yml
@@ -18,4 +18,4 @@
## Placement service
placement_git_repo: "{{ openstack_opendev_base_url }}/openstack/placement"
placement_git_install_branch: af00c864e98ae76cae3e621ad95868234d027882
-placement_git_track_branch: stable/2024.1
+placement_git_track_branch: master
diff --git a/inventory/group_vars/skyline_all/source_git.yml b/inventory/group_vars/skyline_all/source_git.yml
index e91c0097ef..f94cdf86e4 100644
--- a/inventory/group_vars/skyline_all/source_git.yml
+++ b/inventory/group_vars/skyline_all/source_git.yml
@@ -18,7 +18,7 @@
## Skyline service
skyline_git_repo: "{{ openstack_opendev_base_url }}/openstack/skyline-apiserver"
skyline_git_install_branch: b18edc14c0b2b5917fbad2b1d82117e005010272
-skyline_git_track_branch: stable/2024.1
+skyline_git_track_branch: master
skyline_console_git_repo: "{{ openstack_opendev_base_url }}/openstack/skyline-console"
skyline_console_git_install_branch: 4.0.0
diff --git a/inventory/group_vars/swift_all/source_git.yml b/inventory/group_vars/swift_all/source_git.yml
index ff10693dba..884d289d0d 100644
--- a/inventory/group_vars/swift_all/source_git.yml
+++ b/inventory/group_vars/swift_all/source_git.yml
@@ -18,4 +18,4 @@
## Swift service
swift_git_repo: "{{ openstack_opendev_base_url }}/openstack/swift"
swift_git_install_branch: 46aabac092b2e721b5b81c5684498e4bd4f6759a
-swift_git_track_branch: stable/2024.1
+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 f641e7f61e..aaa57f9de4 100644
--- a/inventory/group_vars/tacker_all/source_git.yml
+++ b/inventory/group_vars/tacker_all/source_git.yml
@@ -18,4 +18,4 @@
## Tacker service
tacker_git_repo: "{{ openstack_opendev_base_url }}/openstack/tacker"
tacker_git_install_branch: 947777edf2b3ec403b96a181159c6dbc91060971
-tacker_git_track_branch: stable/2024.1
+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 e9d583d66f..827794cc5e 100644
--- a/inventory/group_vars/trove_all/source_git.yml
+++ b/inventory/group_vars/trove_all/source_git.yml
@@ -18,4 +18,4 @@
## Trove service
trove_git_repo: "{{ openstack_opendev_base_url }}/openstack/trove"
trove_git_install_branch: 2509b467405a3d840f45f3c960a06d8d319a8114
-trove_git_track_branch: stable/2024.1
+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 f13f2009d1..5f4aa8a56c 100644
--- a/inventory/group_vars/utility_all/source_git.yml
+++ b/inventory/group_vars/utility_all/source_git.yml
@@ -17,92 +17,92 @@
tempest_git_repo: "{{ openstack_opendev_base_url }}/openstack/tempest"
tempest_git_install_branch: 16f6a0d55f880b4b9b4d7bb198f266eefe56daf1
-tempest_git_track_branch: None
+tempest_git_track_branch: master
tempest_plugin_barbican_git_repo: "{{ openstack_opendev_base_url }}/openstack/barbican-tempest-plugin"
tempest_plugin_barbican_git_install_branch: 82b0e48639ad52838902dffbc3acaa5bc789b87e
-tempest_plugin_barbican_git_track_branch: None
+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: c5ef0113dfcd34b40ee039b250883ca19640d108
-tempest_plugin_blazar_git_track_branch: None
+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: a259e8d43eb2ee78fe3ad6d0424ecd42bfd18cbd
-tempest_plugin_cinder_git_track_branch: None
+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: e675206288273a45cb8d18a98ab275adf4c79a87
-tempest_plugin_cloudkitty_git_track_branch: None
+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: 347fdbc9b4595a10b726526b3c0b5928e5b7fcf2
-tempest_plugin_designate_git_track_branch: None
+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: d6f7287947731da139413899ddddddcfb95e1a50
-tempest_plugin_glance_git_track_branch: None
+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: 5a484926adedcb4676617b5bc4e3ca7acac7428d
-tempest_plugin_heat_git_track_branch: None
+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: 72417706034ccce75450e10fcac57100b1f8d1d5
-tempest_plugin_ironic_git_track_branch: None
+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: b2aa462f0ea16e0c2c0bf350cd99e29e2988f0f0
-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: ed4cc97d4da543e66da843069fefde4b8acbebab
-tempest_plugin_magnum_git_track_branch: None
+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: 1687dd6ef680d13205c9cfb99396752f864987c6
-tempest_plugin_manila_git_track_branch: None
+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: d2b794cbf0f33c39db85d0a59e38851f579b1d5a
-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: 7e3ba069dc8d75ad0a8dcfed230766bdec5faafb
-tempest_plugin_neutron_git_track_branch: None
+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: a1a2bed19ffe387212364018c61f4a2ae1cff78b
-tempest_plugin_octavia_git_track_branch: None
+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: dadcdeb7ea767acf0bf65b5ef83d9889a1d19931
-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: 3ae7a196643d06078e35c72c381b0a37608b8e17
-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: 59f747814abd70b0c44de1d16fe7eb420363053c
-tempest_plugin_telemetry_git_track_branch: None
+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: 5eb7e702ad8cf95e8e6c52da85e7f27db7b72d5d
-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: ffefe045df3f8dbfbc0c5b24fc89dfbc9e27500a
-tempest_plugin_zaqar_git_track_branch: None
+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: 2c05430515be6d253abbc3d5a8af7d28a5827409
-rally_openstack_git_track_branch: None
+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 453c3d4d7c..2ecd12cd51 100644
--- a/inventory/group_vars/zun_all/source_git.yml
+++ b/inventory/group_vars/zun_all/source_git.yml
@@ -18,14 +18,14 @@
## Zun service
zun_git_repo: "{{ openstack_opendev_base_url }}/openstack/zun"
zun_git_install_branch: 75d13bae26e9b9658277ffeba62e3b65767bb248
-zun_git_track_branch: stable/2024.1
+zun_git_track_branch: master
## Zun kuryr service
zun_kuryr_git_repo: "{{ openstack_opendev_base_url }}/openstack/kuryr-libnetwork"
zun_kuryr_git_install_branch: e57ae2e9f33966a527c44d7fba9ad4854c5c1116
-zun_kuryr_git_track_branch: stable/2024.1
+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: ccb85d13c955940770b0861257eb2b1d7247558e
-zun_kuryr_lib_git_track_branch: stable/2024.1
+zun_kuryr_lib_git_track_branch: master
diff --git a/scripts/run-upgrade.sh b/scripts/run-upgrade.sh
index 68c5517057..cce4f1f685 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=("2023.1", "2023.2")
+export SUPPORTED_SOURCE_SERIES=("2024.1")
# The expected target series name
-export TARGET_SERIES="2024.1"
+export TARGET_SERIES="2024.2"
# The expected OSA config dir
export OSA_CONFIG_DIR="${OSA_CONFIG_DIR:-/etc/openstack_deploy}"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 534d306573..4aa0c7fa92 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -432,12 +432,6 @@
nodeset: ubuntu-jammy
timeout: 10800
-- job:
- name: openstack-ansible-upgrade_2023.1-aio_metal-ubuntu-jammy
- parent: openstack-ansible-deploy-aio
- nodeset: ubuntu-jammy
- timeout: 10800
-
- job:
name: openstack-ansible-deploy-aio_metal_stepca-ubuntu-jammy
parent: openstack-ansible-deploy-aio
@@ -881,12 +875,6 @@
nodeset: rockylinux-9
timeout: 10800
-- job:
- name: openstack-ansible-upgrade_2023.1-aio_metal-rockylinux-9
- parent: openstack-ansible-deploy-aio
- nodeset: rockylinux-9
- timeout: 10800
-
- job:
name: openstack-ansible-deploy-hosts_lxc_overlayfs-rockylinux-9
parent: openstack-ansible-deploy-aio
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index 9b6b2a4e99..05f11eb16f 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -76,9 +76,7 @@
check:
jobs:
- openstack-ansible-upgrade-aio_metal-rockylinux-9
- - openstack-ansible-upgrade_2023.1-aio_metal-rockylinux-9
- openstack-ansible-upgrade-aio_metal-ubuntu-jammy
- - openstack-ansible-upgrade_2023.1-aio_metal-ubuntu-jammy
gate:
jobs:
- openstack-ansible-upgrade-aio_metal-rockylinux-9
@@ -191,9 +189,7 @@
- openstack-ansible-deploy-aio_metal_tls-ubuntu-jammy
- openstack-ansible-deploy-aio_metal_haqueues-ubuntu-jammy
- openstack-ansible-upgrade-aio_metal-rockylinux-9
- - openstack-ansible-upgrade_2023.1-aio_metal-rockylinux-9
- openstack-ansible-upgrade-aio_metal-ubuntu-jammy
- - openstack-ansible-upgrade_2023.1-aio_metal-ubuntu-jammy
- openstack-ansible-upgrade-aio_metal_tls-rockylinux-9
- openstack-ansible-upgrade-aio_metal_tls-ubuntu-jammy