From 13de7f3da27ca5de098016abab34eca37eed391d Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 11 Jun 2022 00:58:49 +0900 Subject: [PATCH] CentOS: Switch to yoga release Change-Id: I77f2b1e229dc9b6cd84bc0dddcfbf9582b7312dc (cherry picked from commit 351cd2427675269e1a5f0a6519d115a40d7abbc3) --- manifests/repo/redhat/params.pp | 2 +- .../openstack_extras_repo_redhat_redhat_spec.rb | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/manifests/repo/redhat/params.pp b/manifests/repo/redhat/params.pp index a0f7855..a29bf91 100644 --- a/manifests/repo/redhat/params.pp +++ b/manifests/repo/redhat/params.pp @@ -4,7 +4,7 @@ # OS family repo classes. # class openstack_extras::repo::redhat::params { - $release = 'xena' + $release = 'yoga' if versioncmp($::operatingsystemmajrelease, '9') >= 0 { $manage_virt = false diff --git a/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb b/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb index b0e03b8..6d5e53b 100644 --- a/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb +++ b/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb @@ -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-xena/", - :descr => "OpenStack Xena Repository", + :baseurl => "http://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}-stream/cloud/$basearch/openstack-yoga/", + :descr => "OpenStack Yoga Repository", :gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud', :enabled => '1', :gpgcheck => '1', @@ -250,7 +250,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-xena/", + :baseurl => "http://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}/cloud/\$basearch/openstack-yoga/", )} it { should contain_yumrepo('centos-advanced-virt').with( @@ -269,7 +269,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-xena/", + :baseurl => "http://foo.bar/centos/#{facts[:operatingsystemmajrelease]}-stream/cloud/\$basearch/openstack-yoga/", )} it { should contain_yumrepo('centos-advanced-virt').with( @@ -391,7 +391,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-xena/", + :baseurl => "http://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}/cloud/\$basearch/openstack-yoga/", )} end @@ -414,7 +414,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-xena/", + :baseurl => "http://foo.bar/centos/#{facts[:operatingsystemmajrelease]}-stream/cloud/\$basearch/openstack-yoga/", )} end