Switch to stable/2023.2

Change-Id: I070e4c4cccc53efe0bffd84f28fddc33431642a9
2023-10-17 03:36:23 +09:00
parent 94cc39ec2a
commit 75e0aab2d3
4 changed files with 74 additions and 37 deletions
--- a/68
+++ b/68
@@ -3,15 +3,15 @@
 ## OpenStack modules
 mod 'aodh',
  :git => 'https://opendev.org/openstack/puppet-aodh',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'barbican',
  :git => 'https://opendev.org/openstack/puppet-barbican',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'ceilometer',
  :git => 'https://opendev.org/openstack/puppet-ceilometer',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'ceph',
  :git => 'https://opendev.org/openstack/puppet-ceph',
@@ -19,127 +19,127 @@ mod 'ceph',

 mod 'cinder',
  :git => 'https://opendev.org/openstack/puppet-cinder',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'cloudkitty',
  :git => 'https://opendev.org/openstack/puppet-cloudkitty',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'designate',
  :git => 'https://opendev.org/openstack/puppet-designate',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'ec2api',
  :git => 'https://opendev.org/openstack/puppet-ec2api',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'glance',
  :git => 'https://opendev.org/openstack/puppet-glance',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'gnocchi',
  :git => 'https://opendev.org/openstack/puppet-gnocchi',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'heat',
  :git => 'https://opendev.org/openstack/puppet-heat',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'horizon',
  :git => 'https://opendev.org/openstack/puppet-horizon',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'ironic',
  :git => 'https://opendev.org/openstack/puppet-ironic',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'keystone',
  :git => 'https://opendev.org/openstack/puppet-keystone',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'magnum',
  :git => 'https://opendev.org/openstack/puppet-magnum',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'manila',
  :git => 'https://opendev.org/openstack/puppet-manila',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'mistral',
  :git => 'https://opendev.org/openstack/puppet-mistral',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'murano',
  :git => 'https://opendev.org/openstack/puppet-murano',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'neutron',
  :git => 'https://opendev.org/openstack/puppet-neutron',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'nova',
  :git => 'https://opendev.org/openstack/puppet-nova',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'octavia',
  :git => 'https://opendev.org/openstack/puppet-octavia',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'openstack_extras',
  :git => 'https://opendev.org/openstack/puppet-openstack_extras',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'openstacklib',
  :git => 'https://opendev.org/openstack/puppet-openstacklib',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'oslo',
  :git => 'https://opendev.org/openstack/puppet-oslo',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'ovn',
  :git => 'https://opendev.org/openstack/puppet-ovn',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'placement',
  :git => 'https://opendev.org/openstack/puppet-placement',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'qdr',
  :git => 'https://opendev.org/openstack/puppet-qdr',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'sahara',
  :git => 'https://opendev.org/openstack/puppet-sahara',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'swift',
  :git => 'https://opendev.org/openstack/puppet-swift',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'tempest',
  :git => 'https://opendev.org/openstack/puppet-tempest',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'trove',
  :git => 'https://opendev.org/openstack/puppet-trove',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'vswitch',
  :git => 'https://opendev.org/openstack/puppet-vswitch',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'vitrage',
  :git => 'https://opendev.org/openstack/puppet-vitrage',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'watcher',
  :git => 'https://opendev.org/openstack/puppet-watcher',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 mod 'zaqar',
  :git => 'https://opendev.org/openstack/puppet-zaqar',
-  :ref => 'master'
+  :ref => 'stable/2023.2'

 ## External modules
 mod 'kmod',
--- a/configure_facts.sh
+++ b/configure_facts.sh
@@ -18,7 +18,7 @@ export OS_NAME_VERS=${ID}${VERSION_ID}

 # Write out facts to the facter folder when we generate them.
 export WRITE_FACTS=${WRITE_FACTS:-true}
-export OPENSTACK_VERSION=${OPENSTACK_VERSION:-master}
+export OPENSTACK_VERSION=${OPENSTACK_VERSION:-bobcat}
 export DLRN_TAG=${DLRN_TAG:-puppet-passed-ci}
 export DLRN_ROOT=${DLRN_ROOT:-${OS_NAME_VERS}-${OPENSTACK_VERSION}}
 export DLRN_BASE=${DLRN_BASE:-${DLRN_ROOT}/${DLRN_TAG}}
--- a/manifests/repos.pp
+++ b/manifests/repos.pp
@@ -70,13 +70,13 @@ class openstack_integration::repos {
      if $facts['delorean_repo_path'] and $facts['delorean_repo_path'] != '' {
        $delorean_repo = $facts['delorean_repo_path']
      } else {
-        $delorean_repo = "https://trunk.rdoproject.org/centos${facts['os']['release']['major']}-master/puppet-passed-ci/delorean.repo"
+        $delorean_repo = "https://trunk.rdoproject.org/centos${facts['os']['release']['major']}-bobcat/puppet-passed-ci/delorean.repo"
      }

      if $facts['delorean_deps_repo_path'] and $facts['delorean_deps_repo_path'] != '' {
        $delorean_deps_repo = $facts['delorean_deps_repo_path']
      } else {
-        $delorean_deps_repo = "https://trunk.rdoproject.org/centos${facts['os']['release']['major']}-master/delorean-deps.repo"
+        $delorean_deps_repo = "https://trunk.rdoproject.org/centos${facts['os']['release']['major']}-bobcat/delorean-deps.repo"
      }

      class { 'openstack_extras::repo::redhat::redhat':
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -5,45 +5,82 @@
    parent: puppet-openstack-base
    required-projects:
      - name: openstack/openstack
+        override-checkout: stable/2023.2
      - name: openstack/puppet-aodh
+        override-checkout: stable/2023.2
      - name: openstack/puppet-barbican
+        override-checkout: stable/2023.2
      - name: openstack/puppet-ceilometer
+        override-checkout: stable/2023.2
      - name: openstack/puppet-ceph
      - name: openstack/puppet-cinder
+        override-checkout: stable/2023.2
      - name: openstack/puppet-cloudkitty
+        override-checkout: stable/2023.2
      - name: openstack/puppet-designate
+        override-checkout: stable/2023.2
      - name: openstack/puppet-ec2api
+        override-checkout: stable/2023.2
      - name: openstack/puppet-glance
+        override-checkout: stable/2023.2
      - name: openstack/puppet-gnocchi
+        override-checkout: stable/2023.2
      - name: openstack/puppet-heat
+        override-checkout: stable/2023.2
      - name: openstack/puppet-horizon
+        override-checkout: stable/2023.2
      - name: openstack/puppet-ironic
+        override-checkout: stable/2023.2
      - name: openstack/puppet-keystone
+        override-checkout: stable/2023.2
      - name: openstack/puppet-magnum
+        override-checkout: stable/2023.2
      - name: openstack/puppet-manila
+        override-checkout: stable/2023.2
      - name: openstack/puppet-mistral
+        override-checkout: stable/2023.2
      - name: x/puppet-modulesync-configs
      - name: openstack/puppet-murano
+        override-checkout: stable/2023.2
      - name: openstack/puppet-neutron
+        override-checkout: stable/2023.2
      - name: openstack/puppet-nova
+        override-checkout: stable/2023.2
      - name: openstack/puppet-octavia
+        override-checkout: stable/2023.2
      - name: openstack/puppet-openstack-cookiecutter
      - name: openstack/puppet-openstack-integration
+        override-checkout: stable/2023.2
      - name: openstack/puppet-openstack_extras
+        override-checkout: stable/2023.2
      - name: openstack/puppet-openstack_spec_helper
+        override-checkout: stable/2023.2
      - name: openstack/puppet-openstacklib
+        override-checkout: stable/2023.2
      - name: openstack/puppet-oslo
+        override-checkout: stable/2023.2
      - name: openstack/puppet-ovn
+        override-checkout: stable/2023.2
      - name: openstack/puppet-placement
+        override-checkout: stable/2023.2
      - name: openstack/puppet-qdr
+        override-checkout: stable/2023.2
      - name: openstack/puppet-sahara
+        override-checkout: stable/2023.2
      - name: openstack/puppet-swift
+        override-checkout: stable/2023.2
      - name: openstack/puppet-tempest
+        override-checkout: stable/2023.2
      - name: openstack/puppet-trove
+        override-checkout: stable/2023.2
      - name: openstack/puppet-vswitch
+        override-checkout: stable/2023.2
      - name: openstack/puppet-vitrage
+        override-checkout: stable/2023.2
      - name: openstack/puppet-watcher
+        override-checkout: stable/2023.2
      - name: openstack/puppet-zaqar
+        override-checkout: stable/2023.2
      - name: openstack/tempest
      - name: openstack/neutron-tempest-plugin