Switch to stable/2024.1

Since 2024.1 release was created we can start testing the release
content. Note that Ubuntu continues using 2023.2 until 2024.1 is
released in UCA.

Change-Id: Ia366cf2886d3b68fad190cb47e914949747b9cfe
This commit is contained in:
Takashi Kajinami 2024-04-18 22:03:07 +09:00
parent 198cb41a76
commit c15721c794
3 changed files with 33 additions and 33 deletions

View File

@ -3,15 +3,15 @@
## OpenStack modules ## OpenStack modules
mod 'aodh', mod 'aodh',
:git => 'https://opendev.org/openstack/puppet-aodh', :git => 'https://opendev.org/openstack/puppet-aodh',
:ref => 'master' :ref => 'stable/2024.1'
mod 'barbican', mod 'barbican',
:git => 'https://opendev.org/openstack/puppet-barbican', :git => 'https://opendev.org/openstack/puppet-barbican',
:ref => 'master' :ref => 'stable/2024.1'
mod 'ceilometer', mod 'ceilometer',
:git => 'https://opendev.org/openstack/puppet-ceilometer', :git => 'https://opendev.org/openstack/puppet-ceilometer',
:ref => 'master' :ref => 'stable/2024.1'
mod 'ceph', mod 'ceph',
:git => 'https://opendev.org/openstack/puppet-ceph', :git => 'https://opendev.org/openstack/puppet-ceph',
@ -19,111 +19,111 @@ mod 'ceph',
mod 'cinder', mod 'cinder',
:git => 'https://opendev.org/openstack/puppet-cinder', :git => 'https://opendev.org/openstack/puppet-cinder',
:ref => 'master' :ref => 'stable/2024.1'
mod 'cloudkitty', mod 'cloudkitty',
:git => 'https://opendev.org/openstack/puppet-cloudkitty', :git => 'https://opendev.org/openstack/puppet-cloudkitty',
:ref => 'master' :ref => 'stable/2024.1'
mod 'designate', mod 'designate',
:git => 'https://opendev.org/openstack/puppet-designate', :git => 'https://opendev.org/openstack/puppet-designate',
:ref => 'master' :ref => 'stable/2024.1'
mod 'glance', mod 'glance',
:git => 'https://opendev.org/openstack/puppet-glance', :git => 'https://opendev.org/openstack/puppet-glance',
:ref => 'master' :ref => 'stable/2024.1'
mod 'gnocchi', mod 'gnocchi',
:git => 'https://opendev.org/openstack/puppet-gnocchi', :git => 'https://opendev.org/openstack/puppet-gnocchi',
:ref => 'master' :ref => 'stable/2024.1'
mod 'heat', mod 'heat',
:git => 'https://opendev.org/openstack/puppet-heat', :git => 'https://opendev.org/openstack/puppet-heat',
:ref => 'master' :ref => 'stable/2024.1'
mod 'horizon', mod 'horizon',
:git => 'https://opendev.org/openstack/puppet-horizon', :git => 'https://opendev.org/openstack/puppet-horizon',
:ref => 'master' :ref => 'stable/2024.1'
mod 'ironic', mod 'ironic',
:git => 'https://opendev.org/openstack/puppet-ironic', :git => 'https://opendev.org/openstack/puppet-ironic',
:ref => 'master' :ref => 'stable/2024.1'
mod 'keystone', mod 'keystone',
:git => 'https://opendev.org/openstack/puppet-keystone', :git => 'https://opendev.org/openstack/puppet-keystone',
:ref => 'master' :ref => 'stable/2024.1'
mod 'magnum', mod 'magnum',
:git => 'https://opendev.org/openstack/puppet-magnum', :git => 'https://opendev.org/openstack/puppet-magnum',
:ref => 'master' :ref => 'stable/2024.1'
mod 'manila', mod 'manila',
:git => 'https://opendev.org/openstack/puppet-manila', :git => 'https://opendev.org/openstack/puppet-manila',
:ref => 'master' :ref => 'stable/2024.1'
mod 'mistral', mod 'mistral',
:git => 'https://opendev.org/openstack/puppet-mistral', :git => 'https://opendev.org/openstack/puppet-mistral',
:ref => 'master' :ref => 'stable/2024.1'
mod 'neutron', mod 'neutron',
:git => 'https://opendev.org/openstack/puppet-neutron', :git => 'https://opendev.org/openstack/puppet-neutron',
:ref => 'master' :ref => 'stable/2024.1'
mod 'nova', mod 'nova',
:git => 'https://opendev.org/openstack/puppet-nova', :git => 'https://opendev.org/openstack/puppet-nova',
:ref => 'master' :ref => 'stable/2024.1'
mod 'octavia', mod 'octavia',
:git => 'https://opendev.org/openstack/puppet-octavia', :git => 'https://opendev.org/openstack/puppet-octavia',
:ref => 'master' :ref => 'stable/2024.1'
mod 'openstack_extras', mod 'openstack_extras',
:git => 'https://opendev.org/openstack/puppet-openstack_extras', :git => 'https://opendev.org/openstack/puppet-openstack_extras',
:ref => 'master' :ref => 'stable/2024.1'
mod 'openstacklib', mod 'openstacklib',
:git => 'https://opendev.org/openstack/puppet-openstacklib', :git => 'https://opendev.org/openstack/puppet-openstacklib',
:ref => 'master' :ref => 'stable/2024.1'
mod 'oslo', mod 'oslo',
:git => 'https://opendev.org/openstack/puppet-oslo', :git => 'https://opendev.org/openstack/puppet-oslo',
:ref => 'master' :ref => 'stable/2024.1'
mod 'ovn', mod 'ovn',
:git => 'https://opendev.org/openstack/puppet-ovn', :git => 'https://opendev.org/openstack/puppet-ovn',
:ref => 'master' :ref => 'stable/2024.1'
mod 'placement', mod 'placement',
:git => 'https://opendev.org/openstack/puppet-placement', :git => 'https://opendev.org/openstack/puppet-placement',
:ref => 'master' :ref => 'stable/2024.1'
mod 'swift', mod 'swift',
:git => 'https://opendev.org/openstack/puppet-swift', :git => 'https://opendev.org/openstack/puppet-swift',
:ref => 'master' :ref => 'stable/2024.1'
mod 'tempest', mod 'tempest',
:git => 'https://opendev.org/openstack/puppet-tempest', :git => 'https://opendev.org/openstack/puppet-tempest',
:ref => 'master' :ref => 'stable/2024.1'
mod 'trove', mod 'trove',
:git => 'https://opendev.org/openstack/puppet-trove', :git => 'https://opendev.org/openstack/puppet-trove',
:ref => 'master' :ref => 'stable/2024.1'
mod 'vswitch', mod 'vswitch',
:git => 'https://opendev.org/openstack/puppet-vswitch', :git => 'https://opendev.org/openstack/puppet-vswitch',
:ref => 'master' :ref => 'stable/2024.1'
mod 'vitrage', mod 'vitrage',
:git => 'https://opendev.org/openstack/puppet-vitrage', :git => 'https://opendev.org/openstack/puppet-vitrage',
:ref => 'master' :ref => 'stable/2024.1'
mod 'watcher', mod 'watcher',
:git => 'https://opendev.org/openstack/puppet-watcher', :git => 'https://opendev.org/openstack/puppet-watcher',
:ref => 'master' :ref => 'stable/2024.1'
mod 'zaqar', mod 'zaqar',
:git => 'https://opendev.org/openstack/puppet-zaqar', :git => 'https://opendev.org/openstack/puppet-zaqar',
:ref => 'master' :ref => 'stable/2024.1'
## External modules ## External modules
mod 'kmod', mod 'kmod',

View File

@ -18,7 +18,7 @@ export OS_NAME_VERS=${ID}${VERSION_ID}
# Write out facts to the facter folder when we generate them. # Write out facts to the facter folder when we generate them.
export WRITE_FACTS=${WRITE_FACTS:-true} export WRITE_FACTS=${WRITE_FACTS:-true}
export OPENSTACK_VERSION=${OPENSTACK_VERSION:-master} export OPENSTACK_VERSION=${OPENSTACK_VERSION:-caracal}
export DLRN_TAG=${DLRN_TAG:-puppet-passed-ci} export DLRN_TAG=${DLRN_TAG:-puppet-passed-ci}
export DLRN_ROOT=${DLRN_ROOT:-${OS_NAME_VERS}-${OPENSTACK_VERSION}} export DLRN_ROOT=${DLRN_ROOT:-${OS_NAME_VERS}-${OPENSTACK_VERSION}}
export DLRN_BASE=${DLRN_BASE:-${DLRN_ROOT}/${DLRN_TAG}} export DLRN_BASE=${DLRN_BASE:-${DLRN_ROOT}/${DLRN_TAG}}

View File

@ -61,11 +61,11 @@ class openstack_integration::repos {
) )
$delorean_repo = pick( $delorean_repo = pick(
$facts['delorean_repo_path'], $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']}-caracal/puppet-passed-ci/delorean.repo"
) )
$delorean_deps_repo = pick( $delorean_deps_repo = pick(
$facts['delorean_deps_repo_path'], $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']}-caracal/delorean-deps.repo"
) )
class { 'openstack_extras::repo::redhat::redhat': class { 'openstack_extras::repo::redhat::redhat':