From fb1f620eda37a36afe2f68e3af814fd13e3b102b Mon Sep 17 00:00:00 2001
From: Joel Capitao <jcapitao@redhat.com>
Date: Mon, 7 Oct 2024 11:42:31 +0200
Subject: [PATCH] Switch to stable/2024.2 branch

Change-Id: I0cb4d6d0f5ae8d77c4e551cd2ac1154bc9a62278
---
 .gitreview |  1 +
 .zuul.yaml |  8 ++++----
 Puppetfile | 56 +++++++++++++++++++++++++++---------------------------
 3 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/.gitreview b/.gitreview
index 463987619..df81d4bc1 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.opendev.org
 port=29418
 project=x/packstack.git
+defaultbranch=stable/2024.2
diff --git a/.zuul.yaml b/.zuul.yaml
index 3ca8ff1dc..71bf42798 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -35,8 +35,8 @@
     parent: packstack-base
     vars:
       selinux_enforcing: "false"
-      delorean: "https://trunk.rdoproject.org/centos9-master/puppet-passed-ci/delorean.repo"
-      delorean_deps: "https://trunk.rdoproject.org/centos9-master/delorean-deps.repo"
+      delorean: "https://trunk.rdoproject.org/centos9-dalmatian/puppet-passed-ci/delorean.repo"
+      delorean_deps: "https://trunk.rdoproject.org/centos9-dalmatian/delorean-deps.repo"
     pre-run: playbooks/packstack-centos9-pre.yaml
     nodeset:
       nodes:
@@ -49,8 +49,8 @@
     parent: packstack-base
     vars:
       selinux_enforcing: "false"
-      delorean: "https://trunk.rdoproject.org/centos9-master/puppet-passed-ci/delorean.repo"
-      delorean_deps: "https://trunk.rdoproject.org/centos9-master/delorean-deps.repo"
+      delorean: "https://trunk.rdoproject.org/centos9-dalmatian/puppet-passed-ci/delorean.repo"
+      delorean_deps: "https://trunk.rdoproject.org/centos9-dalmatian/delorean-deps.repo"
     pre-run: playbooks/packstack-centos9-pre.yaml
     post-run: playbooks/packstack-post-compute.yaml
     nodeset:
diff --git a/Puppetfile b/Puppetfile
index 2fa271aaf..744989673 100755
--- a/Puppetfile
+++ b/Puppetfile
@@ -4,87 +4,87 @@ moduledir '/usr/share/openstack-puppet/modules'
 
 mod 'aodh',
   :git => 'https://github.com/openstack/puppet-aodh',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'ceilometer',
   :git => 'https://github.com/openstack/puppet-ceilometer',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'cinder',
   :git => 'https://github.com/openstack/puppet-cinder',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'glance',
   :git => 'https://github.com/openstack/puppet-glance',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'gnocchi',
   :git => 'https://github.com/openstack/puppet-gnocchi',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'heat',
   :git => 'https://github.com/openstack/puppet-heat',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'magnum',
   :git => 'https://github.com/openstack/puppet-magnum',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'horizon',
   :git => 'https://github.com/openstack/puppet-horizon',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'ironic',
   :git => 'https://github.com/openstack/puppet-ironic',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'keystone',
   :git => 'https://github.com/openstack/puppet-keystone',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'manila',
   :git => 'https://github.com/openstack/puppet-manila',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'neutron',
   :git => 'https://github.com/openstack/puppet-neutron',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'nova',
   :git => 'https://github.com/openstack/puppet-nova',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'openstacklib',
   :git => 'https://github.com/openstack/puppet-openstacklib',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'oslo',
   :git => 'https://github.com/openstack/puppet-oslo',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'ovn',
   :git => 'https://github.com/openstack/puppet-ovn',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'placement',
   :git => 'https://github.com/openstack/puppet-placement',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'swift',
   :git => 'https://github.com/openstack/puppet-swift',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'tempest',
   :git => 'https://github.com/openstack/puppet-tempest',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'trove',
   :git => 'https://github.com/openstack/puppet-trove',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'vswitch',
   :git => 'https://github.com/openstack/puppet-vswitch',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 ## Non-OpenStack modules
 
@@ -114,19 +114,19 @@ mod 'mysql',
 
 mod 'nssdb',
   :git => 'https://github.com/rcritten/puppet-nssdb',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'rabbitmq',
   :git => 'https://github.com/voxpupuli/puppet-rabbitmq',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'redis',
   :git => 'https://github.com/arioch/puppet-redis',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'remote',
   :git => 'https://github.com/paramite/puppet-remote',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'rsync',
   :git => 'https://github.com/puppetlabs/puppetlabs-rsync',
@@ -134,7 +134,7 @@ mod 'rsync',
 
 mod 'ssh',
   :git => 'https://github.com/saz/puppet-ssh',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'stdlib',
   :git => 'https://github.com/puppetlabs/puppetlabs-stdlib',
@@ -142,11 +142,11 @@ mod 'stdlib',
 
 mod 'sysctl',
   :git => 'https://github.com/duritong/puppet-sysctl',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'systemd',
   :git => 'https://github.com/voxpupuli/puppet-systemd',
-  :ref => 'master'
+  :ref => 'stable/2024.2'
 
 mod 'vcsrepo',
   :git => 'https://github.com/puppetlabs/puppetlabs-vcsrepo',