openstack
/
puppet-openstack_extras
Code Issues Proposed changes

Merge "Rename rdo-qemu-ev repo to centos-advanced-virt"

This commit is contained in:
Zuul 2021-05-02 13:20:24 +00:00 committed by Gerrit Code Review
parent 8882469677 655fa83e4d
commit 8dd6e0ea98
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/repo/redhat/redhat.pp
View File

@ -156,10 +156,15 @@ class openstack_extras::repo::redhat::redhat (
$virt_baseurl = "${centos_mirror_url}/centos/${centos_major}/virt/\$basearch/advanced-virtualization/" $virt_baseurl = "${centos_mirror_url}/centos/${centos_major}/virt/\$basearch/advanced-virtualization/"
} }
# TODO(tobias-urdin): Remove this after one cycle.
yumrepo { 'rdo-qemu-ev':
ensure => 'absent',
}
$virt_hash = { $virt_hash = {
'rdo-qemu-ev' => { 'centos-advanced-virt' => {
'baseurl' => $virt_baseurl, 'baseurl' => $virt_baseurl,
'descr' => "RDO CentOS-${$centos_major} - QEMU EV", 'descr' => "CentOS-${$centos_major} - Advanced Virt",
'gpgkey' => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization', 'gpgkey' => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization',
} }
} }

16
spec/classes/openstack_extras_repo_redhat_redhat_spec.rb
View File

@ -24,6 +24,8 @@ describe 'openstack_extras::repo::redhat::redhat' do
:require => 'Anchor[openstack_extras_redhat]', :require => 'Anchor[openstack_extras_redhat]',
)} )}
it { should contain_yumrepo('rdo-qemu-ev').with_ensure('absent') }
it { should contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization').with( it { should contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization').with(
:source => 'puppet:///modules/openstack_extras/RPM-GPG-KEY-CentOS-SIG-Virtualization', :source => 'puppet:///modules/openstack_extras/RPM-GPG-KEY-CentOS-SIG-Virtualization',
:owner => 'root', :owner => 'root',
@ -32,9 +34,9 @@ describe 'openstack_extras::repo::redhat::redhat' do
:before => 'Anchor[openstack_extras_redhat]', :before => 'Anchor[openstack_extras_redhat]',
)} )}
it { should contain_yumrepo('rdo-qemu-ev').with( it { should contain_yumrepo('centos-advanced-virt').with(
:baseurl => "http://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}-stream/virt/$basearch/advancedvirt-common/", :baseurl => "http://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}-stream/virt/$basearch/advancedvirt-common/",
:descr => "RDO CentOS-#{facts[:operatingsystemmajrelease]}-stream - QEMU EV", :descr => "CentOS-#{facts[:operatingsystemmajrelease]}-stream - Advanced Virt",
:gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization', :gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization',
:enabled => '1', :enabled => '1',
:gpgcheck => '1', :gpgcheck => '1',
@ -74,7 +76,7 @@ describe 'openstack_extras::repo::redhat::redhat' do
it { should_not contain_yumrepo('rdo-release') } it { should_not contain_yumrepo('rdo-release') }
it { should_not contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization') } it { should_not contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization') }
it { should_not contain_yumrepo('rdo-qemu-ev') } it { should_not contain_yumrepo('centos-advanced-virt') }
it { should contain_file("/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-#{facts[:operatingsystemmajrelease]}").with( it { should contain_file("/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-#{facts[:operatingsystemmajrelease]}").with(
:source => "puppet:///modules/openstack_extras/RPM-GPG-KEY-EPEL-#{facts[:operatingsystemmajrelease]}", :source => "puppet:///modules/openstack_extras/RPM-GPG-KEY-EPEL-#{facts[:operatingsystemmajrelease]}",
@ -123,9 +125,9 @@ describe 'openstack_extras::repo::redhat::redhat' do
:baseurl => "http://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}/cloud/\$basearch/openstack-victoria/", :baseurl => "http://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}/cloud/\$basearch/openstack-victoria/",
)} )}
it { should contain_yumrepo('rdo-qemu-ev').with( it { should contain_yumrepo('centos-advanced-virt').with(
:baseurl => "http://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}/virt/\$basearch/advanced-virtualization/", :baseurl => "http://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}/virt/\$basearch/advanced-virtualization/",
:descr => "RDO CentOS-#{facts[:operatingsystemmajrelease]} - QEMU EV", :descr => "CentOS-#{facts[:operatingsystemmajrelease]} - Advanced Virt",
)} )}
end end
@ -253,7 +255,7 @@ describe 'openstack_extras::repo::redhat::redhat' do
:baseurl => "http://foo.bar/centos/#{facts[:operatingsystemmajrelease]}-stream/cloud/\$basearch/openstack-victoria/", :baseurl => "http://foo.bar/centos/#{facts[:operatingsystemmajrelease]}-stream/cloud/\$basearch/openstack-victoria/",
)} )}
it { should contain_yumrepo('rdo-qemu-ev').with( it { should contain_yumrepo('centos-advanced-virt').with(
:baseurl => "http://foo.bar/centos/#{facts[:operatingsystemmajrelease]}-stream/virt/\$basearch/advancedvirt-common/", :baseurl => "http://foo.bar/centos/#{facts[:operatingsystemmajrelease]}-stream/virt/\$basearch/advancedvirt-common/",
)} )}
end end
@ -311,7 +313,7 @@ describe 'openstack_extras::repo::redhat::redhat' do
:before => 'Anchor[openstack_extras_redhat]', :before => 'Anchor[openstack_extras_redhat]',
)} )}
it { should contain_yumrepo('rdo-qemu-ev').with( it { should contain_yumrepo('centos-advanced-virt').with(
:enabled => '1', :enabled => '1',
:gpgcheck => '1', :gpgcheck => '1',
:mirrorlist => 'absent', :mirrorlist => 'absent',