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:
Alfredo Moralejo 2016-12-15 16:06:57 +01:00
parent e7e53231d5
commit f1ab3bba85
3 changed files with 0 additions and 4 deletions

View File

@ -33,6 +33,4 @@ class openstack_extras::repo::redhat::params
warning('Unrecognised operatingsystem')
}
}
$rdo_priority = 98
}

View File

@ -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',
}
}

View File

@ -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',