Remove priority for non-delorean RDO repos
RDO doesn't set priority in repository configuration via rdo-release or centos openstack releases rpms. This is currently being a problem as dependencies for qemu-kvm-ev-2.6.0 must be resolved from base and RDO ships same packages with lower VR for historical reasons. Change-Id: Ifb0ec9ca8a98a15984145972e99915e7eb23eb99
This commit is contained in:
parent
e7e53231d5
commit
f1ab3bba85
@ -33,6 +33,4 @@ class openstack_extras::repo::redhat::params
|
||||
warning('Unrecognised operatingsystem')
|
||||
}
|
||||
}
|
||||
|
||||
$rdo_priority = 98
|
||||
}
|
||||
|
@ -102,7 +102,6 @@ class openstack_extras::repo::redhat::redhat(
|
||||
'rdo-release' => {
|
||||
'baseurl' => "${centos_mirror_url}/centos/7/cloud/\$basearch/openstack-${release}/",
|
||||
'descr' => "OpenStack ${release_cap} Repository",
|
||||
'priority' => $::openstack_extras::repo::redhat::params::rdo_priority,
|
||||
'gpgkey' => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud',
|
||||
}
|
||||
}
|
||||
|
@ -52,7 +52,6 @@ describe 'openstack_extras::repo::redhat::redhat' do
|
||||
it { is_expected.to contain_yumrepo('rdo-release').with(
|
||||
:baseurl => "http://mirror.centos.org/centos/7/cloud/$basearch/openstack-newton/",
|
||||
:descr => "OpenStack Newton Repository",
|
||||
:priority => 98,
|
||||
:gpgkey => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud",
|
||||
:enabled => '1',
|
||||
:gpgcheck => '1',
|
||||
|
Loading…
x
Reference in New Issue
Block a user