diff --git a/manifests/repo/redhat/redhat.pp b/manifests/repo/redhat/redhat.pp index fd1b864..552a58a 100644 --- a/manifests/repo/redhat/redhat.pp +++ b/manifests/repo/redhat/redhat.pp @@ -204,6 +204,14 @@ class openstack_extras::repo::redhat::redhat ( module_hotfixes => true, } } + } else { + # NOTE(tkajinam): Ensure the advanced-virt repository is purged + file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization': + ensure => absent + } + yumrepo { 'centos-advanced-virt': + ensure => absent + } } if $manage_epel { diff --git a/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb b/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb index ea678ee..5af9d4a 100644 --- a/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb +++ b/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb @@ -43,8 +43,12 @@ describe 'openstack_extras::repo::redhat::redhat' do it { should_not contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud') } 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_yumrepo('centos-advanced-virt') } + it { should contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization').with( + :ensure => 'absent' + ) } + it { should contain_yumrepo('centos-advanced-virt').with( + :ensure => 'absent' + ) } 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]}", @@ -378,8 +382,12 @@ describe 'openstack_extras::repo::redhat::redhat' do shared_examples 'openstack_extras::repo::redhat::redhat in CentOS >= 9' do context 'with default parameters' do it { should_not contain_yumrepo('rdo-qemu-ev') } - it { should_not contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization') } - it { should_not contain_yumrepo('centos-advanced-virt') } + it { should contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization').with( + :ensure => 'absent' + ) } + it { should contain_yumrepo('centos-advanced-virt').with( + :ensure => 'absent' + ) } it { should contain_yumrepo('rdo-release').with( :baseurl => "http://mirror.stream.centos.org/SIGs/#{facts[:operatingsystemmajrelease]}-stream/cloud/$basearch/openstack-yoga/",