Wallaby-only: Use stable/wallaby release by default

Change-Id: I5f46cb0fad7cc036231bf2d97649114a98238c23
This commit is contained in:
Takashi Kajinami
2022-02-06 01:13:57 +09:00
parent b39f30c410
commit 360fe51a01
5 changed files with 16 additions and 16 deletions

View File

@@ -4,7 +4,7 @@
#
class openstack_extras::repo::debian::params
{
$release = 'victoria'
$release = 'wallaby'
$uca_name = 'ubuntu-cloud-archive'
$uca_location = 'http://ubuntu-cloud.archive.canonical.com/ubuntu'

View File

@@ -5,7 +5,7 @@
#
class openstack_extras::repo::redhat::params
{
$release = 'victoria'
$release = 'wallaby'
$repo_defaults = { 'enabled' => '1',
'gpgcheck' => '1',

View File

@@ -13,7 +13,7 @@ describe 'openstack_extras::repo::debian::debian' do
let :paramclass_defaults do
{
:release => 'victoria'
:release => 'wallaby'
}
end
@@ -27,14 +27,14 @@ describe 'openstack_extras::repo::debian::debian' do
end
it { should contain_apt__source('debian-openstack-backports').with(
:location => 'http://stretch-victoria.debian.net/debian',
:release => 'stretch-victoria-backports',
:location => 'http://stretch-wallaby.debian.net/debian',
:release => 'stretch-wallaby-backports',
:repos => 'main',
)}
it { should contain_apt__source('debian-openstack-backports-nochange').with(
:location => 'http://stretch-victoria.debian.net/debian',
:release => 'stretch-victoria-backports-nochange',
:location => 'http://stretch-wallaby.debian.net/debian',
:release => 'stretch-wallaby-backports-nochange',
:repos => 'main'
)}

View File

@@ -13,7 +13,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
let :paramclass_defaults do
{
:release => 'victoria'
:release => 'wallaby'
}
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 => 'trusty-updates/victoria',
:release => 'trusty-updates/wallaby',
:repos => 'main',
)}
@@ -127,7 +127,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 => 'trusty-proposed/victoria',
:release => 'trusty-proposed/wallaby',
:repos => 'main',
)}
end

View File

@@ -15,7 +15,7 @@ describe 'openstack_extras::repo::redhat::redhat' do
let :paramclass_defaults do
{
:release => 'victoria',
:release => 'wallaby',
:repo_defaults => { 'enabled' => '1',
'gpgcheck' => '1',
'notify' => 'Exec[yum_refresh]',
@@ -40,8 +40,8 @@ describe 'openstack_extras::repo::redhat::redhat' do
end
it { should contain_yumrepo('rdo-release').with(
:baseurl => "http://mirror.centos.org/centos/7/cloud/$basearch/openstack-victoria/",
:descr => 'OpenStack Victoria Repository',
:baseurl => "http://mirror.centos.org/centos/7/cloud/$basearch/openstack-wallaby/",
:descr => 'OpenStack Wallaby Repository',
:gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud',
:enabled => '1',
:gpgcheck => '1',
@@ -127,7 +127,7 @@ describe 'openstack_extras::repo::redhat::redhat' do
end
it { should contain_yumrepo('rdo-release').with(
:baseurl => "http://mirror.centos.org/centos/8-stream/cloud/$basearch/openstack-victoria/",
:baseurl => "http://mirror.centos.org/centos/8-stream/cloud/$basearch/openstack-wallaby/",
)}
it { should contain_yumrepo('rdo-qemu-ev').with(
@@ -201,8 +201,8 @@ describe 'openstack_extras::repo::redhat::redhat' do
end
it { should contain_yumrepo('rdo-release').with(
:baseurl => "http://mirror.dfw.rax.openstack.org/centos/7/cloud/\$basearch/openstack-victoria/",
:descr => 'OpenStack Victoria Repository',
:baseurl => "http://mirror.dfw.rax.openstack.org/centos/7/cloud/\$basearch/openstack-wallaby/",
:descr => 'OpenStack Wallaby Repository',
:gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud',
:proxy => 'http://my.proxy.com:8000'
)}