openstack
/
puppet-openstack_extras
Code Issues Proposed changes

Ubuntu/Debian: Switch to yoga 

Change-Id: If5d114d663459ee44d9191d50a98c4e264e3309b
(cherry picked from commit e5b6421c2d)
This commit is contained in:
Takashi Kajinami 2022-06-29 00:21:09 +09:00 committed by Christian Rohmann
parent efb900123c
commit 81f1370306
3 changed files with 11 additions and 11 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 = 'xena'
$release = 'yoga'
$uca_name = 'ubuntu-cloud-archive'
$uca_location = 'http://ubuntu-cloud.archive.canonical.com/ubuntu'

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