From 407a4eed675eccc4c7f339700e39af9d9ccadd8d Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 5 Oct 2024 00:24:22 +0900 Subject: [PATCH] Switch to stable/2024.2 Since 2024.2 release was created we can start testing the release content. Note that Ubuntu continues using 2023.2 until 2024.2 is released in UCA. Change-Id: I8fe7c157b57ef0017f771982793b1fa76f19e5da --- Puppetfile | 60 +++++++++++++++++++++++----------------------- configure_facts.sh | 2 +- manifests/repos.pp | 4 ++-- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Puppetfile b/Puppetfile index deaba7238..5856cf5df 100644 --- a/Puppetfile +++ b/Puppetfile @@ -3,15 +3,15 @@ ## OpenStack modules mod 'aodh', :git => 'https://opendev.org/openstack/puppet-aodh', - :ref => 'master' + :ref => 'stable/2024.2' mod 'barbican', :git => 'https://opendev.org/openstack/puppet-barbican', - :ref => 'master' + :ref => 'stable/2024.2' mod 'ceilometer', :git => 'https://opendev.org/openstack/puppet-ceilometer', - :ref => 'master' + :ref => 'stable/2024.2' mod 'ceph', :git => 'https://opendev.org/openstack/puppet-ceph', @@ -19,111 +19,111 @@ mod 'ceph', mod 'cinder', :git => 'https://opendev.org/openstack/puppet-cinder', - :ref => 'master' + :ref => 'stable/2024.2' mod 'cloudkitty', :git => 'https://opendev.org/openstack/puppet-cloudkitty', - :ref => 'master' + :ref => 'stable/2024.2' mod 'designate', :git => 'https://opendev.org/openstack/puppet-designate', - :ref => 'master' + :ref => 'stable/2024.2' mod 'glance', :git => 'https://opendev.org/openstack/puppet-glance', - :ref => 'master' + :ref => 'stable/2024.2' mod 'gnocchi', :git => 'https://opendev.org/openstack/puppet-gnocchi', - :ref => 'master' + :ref => 'stable/2024.2' mod 'heat', :git => 'https://opendev.org/openstack/puppet-heat', - :ref => 'master' + :ref => 'stable/2024.2' mod 'horizon', :git => 'https://opendev.org/openstack/puppet-horizon', - :ref => 'master' + :ref => 'stable/2024.2' mod 'ironic', :git => 'https://opendev.org/openstack/puppet-ironic', - :ref => 'master' + :ref => 'stable/2024.2' mod 'keystone', :git => 'https://opendev.org/openstack/puppet-keystone', - :ref => 'master' + :ref => 'stable/2024.2' mod 'magnum', :git => 'https://opendev.org/openstack/puppet-magnum', - :ref => 'master' + :ref => 'stable/2024.2' mod 'manila', :git => 'https://opendev.org/openstack/puppet-manila', - :ref => 'master' + :ref => 'stable/2024.2' mod 'mistral', :git => 'https://opendev.org/openstack/puppet-mistral', - :ref => 'master' + :ref => 'stable/2024.2' mod 'neutron', :git => 'https://opendev.org/openstack/puppet-neutron', - :ref => 'master' + :ref => 'stable/2024.2' mod 'nova', :git => 'https://opendev.org/openstack/puppet-nova', - :ref => 'master' + :ref => 'stable/2024.2' mod 'octavia', :git => 'https://opendev.org/openstack/puppet-octavia', - :ref => 'master' + :ref => 'stable/2024.2' mod 'openstack_extras', :git => 'https://opendev.org/openstack/puppet-openstack_extras', - :ref => 'master' + :ref => 'stable/2024.2' mod 'openstacklib', :git => 'https://opendev.org/openstack/puppet-openstacklib', - :ref => 'master' + :ref => 'stable/2024.2' mod 'oslo', :git => 'https://opendev.org/openstack/puppet-oslo', - :ref => 'master' + :ref => 'stable/2024.2' mod 'ovn', :git => 'https://opendev.org/openstack/puppet-ovn', - :ref => 'master' + :ref => 'stable/2024.2' mod 'placement', :git => 'https://opendev.org/openstack/puppet-placement', - :ref => 'master' + :ref => 'stable/2024.2' mod 'swift', :git => 'https://opendev.org/openstack/puppet-swift', - :ref => 'master' + :ref => 'stable/2024.2' mod 'tempest', :git => 'https://opendev.org/openstack/puppet-tempest', - :ref => 'master' + :ref => 'stable/2024.2' mod 'trove', :git => 'https://opendev.org/openstack/puppet-trove', - :ref => 'master' + :ref => 'stable/2024.2' mod 'vswitch', :git => 'https://opendev.org/openstack/puppet-vswitch', - :ref => 'master' + :ref => 'stable/2024.2' mod 'vitrage', :git => 'https://opendev.org/openstack/puppet-vitrage', - :ref => 'master' + :ref => 'stable/2024.2' mod 'watcher', :git => 'https://opendev.org/openstack/puppet-watcher', - :ref => 'master' + :ref => 'stable/2024.2' mod 'zaqar', :git => 'https://opendev.org/openstack/puppet-zaqar', - :ref => 'master' + :ref => 'stable/2024.2' ## External modules mod 'kmod', diff --git a/configure_facts.sh b/configure_facts.sh index 745915fa1..c6787fda1 100644 --- 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:-dalmatian} 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}} diff --git a/manifests/repos.pp b/manifests/repos.pp index 583cf9a8f..efd20f11c 100644 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@ -51,11 +51,11 @@ class openstack_integration::repos { ) $delorean_repo = pick( $facts['delorean_repo_path'], - "https://trunk.rdoproject.org/centos${facts['os']['release']['major']}-master/puppet-passed-ci/delorean.repo" + "https://trunk.rdoproject.org/centos${facts['os']['release']['major']}-dalmatian/puppet-passed-ci/delorean.repo" ) $delorean_deps_repo = pick( $facts['delorean_deps_repo_path'], - "https://trunk.rdoproject.org/centos${facts['os']['release']['major']}-master/delorean-deps.repo" + "https://trunk.rdoproject.org/centos${facts['os']['release']['major']}-dalmatian/delorean-deps.repo" ) class { 'openstack_extras::repo::redhat::redhat':

AltStyle によって変換されたページ (->オリジナル) /