openstack/puppet-openstack_extras
Code Issues Proposed changes

CentOS: Switch to yoga release

Browse Source 
Change-Id: I77f2b1e229dc9b6cd84bc0dddcfbf9582b7312dc
This commit is contained in:
Takashi Kajinami 2022-06-11 00:58:49 +09:00
parent 7c456d4b69
commit 351cd24276
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 = 'xena' $release = 'yoga'
if versioncmp($::operatingsystemmajrelease, '9') >= 0 { if versioncmp($::operatingsystemmajrelease, '9') >= 0 {
$manage_virt = false $manage_virt = false

12
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( it { should contain_yumrepo('rdo-release').with(
:baseurl => "http://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}-stream/cloud/$basearch/openstack-xena/", :baseurl => "http://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}-stream/cloud/$basearch/openstack-yoga/",
:descr => "OpenStack Xena Repository", :descr => "OpenStack Yoga 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',
@ -250,7 +250,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://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}/cloud/\$basearch/openstack-xena/", :baseurl => "http://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}/cloud/\$basearch/openstack-yoga/",
)} )}
it { should contain_yumrepo('centos-advanced-virt').with( it { should contain_yumrepo('centos-advanced-virt').with(
@ -269,7 +269,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/centos/#{facts[:operatingsystemmajrelease]}-stream/cloud/\$basearch/openstack-xena/", :baseurl => "http://foo.bar/centos/#{facts[:operatingsystemmajrelease]}-stream/cloud/\$basearch/openstack-yoga/",
)} )}
it { should contain_yumrepo('centos-advanced-virt').with( it { should contain_yumrepo('centos-advanced-virt').with(
@ -391,7 +391,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://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}/cloud/\$basearch/openstack-xena/", :baseurl => "http://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}/cloud/\$basearch/openstack-yoga/",
)} )}
end end
@ -414,7 +414,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/centos/#{facts[:operatingsystemmajrelease]}-stream/cloud/\$basearch/openstack-xena/", :baseurl => "http://foo.bar/centos/#{facts[:operatingsystemmajrelease]}-stream/cloud/\$basearch/openstack-yoga/",
)} )}
end end