openstack/puppet-openstack_extras
Code Issues Proposed changes

Update release to antelope

Browse Source 
This switches the default release to antelope as we are close to
create our antelope releases.

Change-Id: Idfc74b71c6255ec79508ed62a0df941655a74424
This commit is contained in:
Takashi Kajinami 2023-03-23 21:41:01 +09:00
parent 42f02f64fe
commit 0265026fc8
5 changed files with 15 additions and 15 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 class openstack_extras::repo::debian::params
{ {
$release = 'zed' $release = 'antelope'
$uca_name = 'ubuntu-cloud-archive' $uca_name = 'ubuntu-cloud-archive'
$uca_location = 'http://ubuntu-cloud.archive.canonical.com/ubuntu' $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. # OS family repo classes.
# #
class openstack_extras::repo::redhat::params { class openstack_extras::repo::redhat::params {
$release = 'zed' $release = 'antelope'
$centos_mirror_url = 'http://mirror.stream.centos.org' $centos_mirror_url = 'http://mirror.stream.centos.org'

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 let :paramclass_defaults do
{ {
:release => 'zed' :release => 'antelope'
} }
end end
@ -23,11 +23,11 @@ describe 'openstack_extras::repo::debian::debian' do
end end
context 'with default params' do context 'with default params' do
it { should contain_exec('/usr/bin/extrepo enable openstack_zed').with( it { should contain_exec('/usr/bin/extrepo enable openstack_antelope').with(
:command => "/bin/true # comment to satisfy puppet syntax requirements :command => "/bin/true # comment to satisfy puppet syntax requirements
apt-get update apt-get update
apt-get install -y extrepo apt-get install -y extrepo
extrepo enable openstack_zed extrepo enable openstack_antelope
apt-get update apt-get update
", ",
)} )}
@ -58,14 +58,14 @@ apt-get update
end end
it { should contain_apt__source('debian-openstack-backports').with( it { should contain_apt__source('debian-openstack-backports').with(
:location => 'http://bullseye-zed.debian.net/debian', :location => 'http://bullseye-antelope.debian.net/debian',
:release => 'bullseye-zed-backports', :release => 'bullseye-antelope-backports',
:repos => 'main', :repos => 'main',
)} )}
it { should contain_apt__source('debian-openstack-backports-nochange').with( it { should contain_apt__source('debian-openstack-backports-nochange').with(
:location => 'http://bullseye-zed.debian.net/debian', :location => 'http://bullseye-antelope.debian.net/debian',
:release => 'bullseye-zed-backports-nochange', :release => 'bullseye-antelope-backports-nochange',
:repos => 'main' :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 let :paramclass_defaults do
{ {
:release => 'zed' :release => 'antelope'
} }
end end
@ -28,7 +28,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
it { should contain_apt__source('ubuntu-cloud-archive').with( it { should contain_apt__source('ubuntu-cloud-archive').with(
:location => 'http://ubuntu-cloud.archive.canonical.com/ubuntu', :location => 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
:release => 'jammy-updates/zed', :release => 'jammy-updates/antelope',
:repos => 'main', :repos => 'main',
)} )}
@ -127,7 +127,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
it { should contain_apt__source('ubuntu-cloud-archive').with( it { should contain_apt__source('ubuntu-cloud-archive').with(
:location => 'http://mirror.dfw.rax.openstack.org/ubuntu-cloud-archive', :location => 'http://mirror.dfw.rax.openstack.org/ubuntu-cloud-archive',
:release => 'jammy-proposed/zed', :release => 'jammy-proposed/antelope',
:repos => 'main', :repos => 'main',
)} )}
end end

6
spec/classes/openstack_extras_repo_redhat_redhat_spec.rb
View File

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