Merge "switch RDO to CBS repositories"

This commit is contained in:
Jenkins 2015-09-11 10:32:50 +00:00 committed by Gerrit Code Review
commit 180b6e837a

View File

@ -31,15 +31,19 @@ case $::osfamily {
class { '::openstack_extras::repo::redhat::redhat': class { '::openstack_extras::repo::redhat::redhat':
manage_rdo => false, manage_rdo => false,
repo_hash => { repo_hash => {
# we need kilo repo to be installed for dependencies 'openstack-common-testing' => {
'rdo-kilo' => { 'baseurl' => 'http://cbs.centos.org/repos/cloud7-openstack-common-testing/x86_64/os/',
'baseurl' => 'https://repos.fedorapeople.org/repos/openstack/openstack-kilo/el7/', 'descr' => 'openstack-common-testing',
'descr' => 'RDO kilo',
'gpgcheck' => 'no', 'gpgcheck' => 'no',
}, },
'rdo-liberty' => { 'openstack-liberty-testing' => {
'baseurl' => 'http://trunk.rdoproject.org/centos7/current/', 'baseurl' => 'http://cbs.centos.org/repos/cloud7-openstack-liberty-testing/x86_64/os/',
'descr' => 'RDO trunk', 'descr' => 'openstack-liberty-testing',
'gpgcheck' => 'no',
},
'openstack-liberty-trunk' => {
'baseurl' => 'http://trunk.rdoproject.org/centos7-liberty/current/',
'descr' => 'openstack-liberty-trunk',
'gpgcheck' => 'no', 'gpgcheck' => 'no',
}, },
}, },