Switch to Dalmatian

To parepare a new module release for Dalmatian, update the default
release name accordingly.

Change-Id: I8c1121d1ba4628b66ac22da0fd05b28246a5cdf6
This commit is contained in:
Takashi Kajinami 2024-09-26 20:43:53 +09:00
parent 6f83f16042
commit 39c9d1c23b
6 changed files with 19 additions and 19 deletions

View File

@ -8,7 +8,7 @@
# [*release*]
# (optional) The OpenStack release to add a
# Debian apt source for.
# Defaults to 'caracal'
# Defaults to 'dalmatian'
#
# [*manage_deb*]
# (optional) Whether or not to add the default
@ -41,7 +41,7 @@
# Defaults to "http://${facts['os']['distro']['codename']}-${release}.debian.net/debian"
#
class openstack_extras::repo::debian::debian(
String[1] $release = 'caracal',
String[1] $release = 'dalmatian',
Boolean $manage_deb = true,
Boolean $package_require = false,
Boolean $use_extrepo = true,

View File

@ -8,7 +8,7 @@
# [*release*]
# (optional) The OpenStack release to add an
# Ubuntu Cloud Archive APT source for.
# Defaults to 'caracal'
# Defaults to 'dalmatian'
#
# [*manage_uca*]
# (optional) Whether or not to add the default
@ -42,7 +42,7 @@
# Defaults to $::openstack_extras::repo::debian::params::uca_location
#
class openstack_extras::repo::debian::ubuntu(
String[1] $release = 'caracal',
String[1] $release = 'dalmatian',
Boolean $manage_uca = true,
Enum['updates', 'proposed'] $repo = 'updates',
Hash $source_hash = {},

View File

@ -7,7 +7,7 @@
#
# [*release*]
# (Optional) The OpenStack release to use.
# Defaults to 'caracal'
# Defaults to 'dalmatian'
#
# [*manage_rdo*]
# (Optional) Whether to create a yumrepo resource for the
@ -72,7 +72,7 @@
# Defaults to false
#
class openstack_extras::repo::redhat::redhat (
String[1] $release = 'caracal',
String[1] $release = 'dalmatian',
Boolean $manage_rdo = true,
Hash $repo_hash = {},
Hash $repo_source_hash = {},

View File

@ -14,7 +14,7 @@ describe 'openstack_extras::repo::debian::debian' do
let :paramclass_defaults do
{
:release => 'caracal'
:release => 'dalmatian'
}
end
@ -23,11 +23,11 @@ describe 'openstack_extras::repo::debian::debian' do
end
context 'with default params' do
it { should contain_exec('/usr/bin/extrepo enable openstack_caracal').with(
it { should contain_exec('/usr/bin/extrepo enable openstack_dalmatian').with(
:command => "/bin/true # comment to satisfy puppet syntax requirements
apt-get update
apt-get install -y extrepo
extrepo enable openstack_caracal
extrepo enable openstack_dalmatian
apt-get update
",
)}
@ -58,14 +58,14 @@ apt-get update
end
it { should contain_apt__source('debian-openstack-backports').with(
:location => "http://#{facts[:os]['distro']['codename']}-caracal.debian.net/debian",
:release => "#{facts[:os]['distro']['codename']}-caracal-backports",
:location => "http://#{facts[:os]['distro']['codename']}-dalmatian.debian.net/debian",
:release => "#{facts[:os]['distro']['codename']}-dalmatian-backports",
:repos => 'main',
)}
it { should contain_apt__source('debian-openstack-backports-nochange').with(
:location => "http://#{facts[:os]['distro']['codename']}-caracal.debian.net/debian",
:release => "#{facts[:os]['distro']['codename']}-caracal-backports-nochange",
:location => "http://#{facts[:os]['distro']['codename']}-dalmatian.debian.net/debian",
:release => "#{facts[:os]['distro']['codename']}-dalmatian-backports-nochange",
:repos => 'main'
)}

View File

@ -13,7 +13,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
let :paramclass_defaults do
{
:release => 'caracal'
:release => 'dalmatian'
}
end
@ -28,7 +28,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
it { should contain_apt__source('ubuntu-cloud-archive').with(
:location => 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
:release => "#{facts[:os]['distro']['codename']}-updates/caracal",
:release => "#{facts[:os]['distro']['codename']}-updates/dalmatian",
:repos => 'main',
)}
@ -130,7 +130,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
it { should contain_apt__source('ubuntu-cloud-archive').with(
:location => 'http://mirror.dfw.rax.openstack.org/ubuntu-cloud-archive',
:release => "#{facts[:os]['distro']['codename']}-proposed/caracal",
:release => "#{facts[:os]['distro']['codename']}-proposed/dalmatian",
:repos => 'main',
)}
end

View File

@ -13,8 +13,8 @@ describe 'openstack_extras::repo::redhat::redhat' do
:before => 'Anchor[openstack_extras_redhat]',
)}
it { should contain_yumrepo('rdo-release').with(
:baseurl => "http://mirror.stream.centos.org/SIGs/$stream/cloud/$basearch/openstack-caracal/",
:descr => "OpenStack Caracal Repository",
:baseurl => "http://mirror.stream.centos.org/SIGs/$stream/cloud/$basearch/openstack-dalmatian/",
:descr => "OpenStack Dalmatian Repository",
:gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud',
:enabled => '1',
:gpgcheck => '1',
@ -126,7 +126,7 @@ describe 'openstack_extras::repo::redhat::redhat' do
end
it { should contain_yumrepo('rdo-release').with(
:baseurl => "http://foo.bar/SIGs/$stream/cloud/$basearch/openstack-caracal/",
:baseurl => "http://foo.bar/SIGs/$stream/cloud/$basearch/openstack-dalmatian/",
)}
end