From 68576fcecf6e88f884ead21d062eb3b3aa99388a Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 10 Sep 2015 18:20:13 -0400 Subject: [PATCH] switch RDO to CBS repositories This patch changes the repositories used to install OpenStack Liberty on RDO by using CBS repositories and RDO trunk. Here is the RDO roadmap that is suggested if we want to run Liberty: From now until GA: http://trunk.rdoproject.org/centos7-liberty/current/ http://cbs.centos.org/repos/cloud7-openstack-liberty-testing/x86_64/os/ http://cbs.centos.org/repos/cloud7-openstack-common-testing/x86_64/os/ After GA: http://mirror.centos.org/centos/7/cloud/x86_64/openstack-liberty Note about EPEL: deps from EPEL are rebuilt in CBS, so EPEL could be disabled in the future. Change-Id: I2841425c0989f34e11207d53c6c99ebbe36ec3ef --- fixtures/scenario001.pp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp index 48b91cd2f..d8bc71cf1 100644 --- a/fixtures/scenario001.pp +++ b/fixtures/scenario001.pp @@ -31,15 +31,19 @@ case $::osfamily { class { '::openstack_extras::repo::redhat::redhat': manage_rdo => false, repo_hash => { - # we need kilo repo to be installed for dependencies - 'rdo-kilo' => { - 'baseurl' => 'https://repos.fedorapeople.org/repos/openstack/openstack-kilo/el7/', - 'descr' => 'RDO kilo', + 'openstack-common-testing' => { + 'baseurl' => 'http://cbs.centos.org/repos/cloud7-openstack-common-testing/x86_64/os/', + 'descr' => 'openstack-common-testing', 'gpgcheck' => 'no', }, - 'rdo-liberty' => { - 'baseurl' => 'http://trunk.rdoproject.org/centos7/current/', - 'descr' => 'RDO trunk', + 'openstack-liberty-testing' => { + 'baseurl' => 'http://cbs.centos.org/repos/cloud7-openstack-liberty-testing/x86_64/os/', + 'descr' => 'openstack-liberty-testing', + 'gpgcheck' => 'no', + }, + 'openstack-liberty-trunk' => { + 'baseurl' => 'http://trunk.rdoproject.org/centos7-liberty/current/', + 'descr' => 'openstack-liberty-trunk', 'gpgcheck' => 'no', }, },