openstack/puppet-openstack_extras
Code Issues Proposed changes

Use stable/xena release by default

Browse Source 
... instead of old stable/victoria.

Change-Id: I29d6a3043260a3258266b87ca50bcc90befb42ee
This commit is contained in:
Takashi Kajinami 2022-02-06 01:20:08 +09:00
parent 04ced48a76
commit 0271adfc05
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/repo/debian/params.pp
View File

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

2
manifests/repo/redhat/params.pp
View File

@ -4,7 +4,7 @@
# OS family repo classes.
#
class openstack_extras::repo::redhat::params {
$release = 'victoria'
$release = 'xena'
$repo_defaults = {
'enabled' => '1',

14
spec/classes/openstack_extras_repo_debian_debian_spec.rb
View File

@ -14,7 +14,7 @@ describe 'openstack_extras::repo::debian::debian' do
let :paramclass_defaults do
{
:release => 'victoria'
:release => 'xena'
}
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_victoria').with(
it { should contain_exec('/usr/bin/extrepo enable openstack_xena').with(
:command => "/bin/true # comment to satisfy puppet syntax requirements
apt-get update
apt-get install -y extrepo
extrepo enable openstack_victoria
extrepo enable openstack_xena
apt-get update
",
)}
@ -58,14 +58,14 @@ apt-get update
end
it { should contain_apt__source('debian-openstack-backports').with(
:location => 'http://stretch-victoria.debian.net/debian',
:release => 'stretch-victoria-backports',
:location => 'http://stretch-xena.debian.net/debian',
:release => 'stretch-xena-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-xena.debian.net/debian',
:release => 'stretch-xena-backports-nochange',
:repos => 'main'
)}

6
spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb
View File

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

8
spec/classes/openstack_extras_repo_redhat_redhat_spec.rb
View File

@ -14,8 +14,8 @@ describe 'openstack_extras::repo::redhat::redhat' do
)}
it { should contain_yumrepo('rdo-release').with(
:baseurl => "http://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}-stream/cloud/$basearch/openstack-victoria/",
:descr => "OpenStack Victoria Repository",
:baseurl => "http://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}-stream/cloud/$basearch/openstack-xena/",
:descr => "OpenStack Xena Repository",
:gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud',
:enabled => '1',
:gpgcheck => '1',
@ -135,7 +135,7 @@ describe 'openstack_extras::repo::redhat::redhat' do
end
it { should contain_yumrepo('rdo-release').with(
:baseurl => "http://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}/cloud/\$basearch/openstack-victoria/",
:baseurl => "http://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}/cloud/\$basearch/openstack-xena/",
)}
it { should contain_yumrepo('centos-advanced-virt').with(
@ -265,7 +265,7 @@ describe 'openstack_extras::repo::redhat::redhat' do
end
it { should contain_yumrepo('rdo-release').with(
:baseurl => "http://foo.bar/centos/#{facts[:operatingsystemmajrelease]}-stream/cloud/\$basearch/openstack-victoria/",
:baseurl => "http://foo.bar/centos/#{facts[:operatingsystemmajrelease]}-stream/cloud/\$basearch/openstack-xena/",
)}
it { should contain_yumrepo('centos-advanced-virt').with(