From 67550c266aad9c20389fd4f4ae6b685e9c771735 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 9 Sep 2015 23:41:58 -0400 Subject: [PATCH] acceptance: 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: I2cd321ba6ee97413c00b27f59bbe52626d34fde6 --- spec/acceptance/basic_nova_spec.rb | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/spec/acceptance/basic_nova_spec.rb b/spec/acceptance/basic_nova_spec.rb index cec443d9f..476930667 100644 --- a/spec/acceptance/basic_nova_spec.rb +++ b/spec/acceptance/basic_nova_spec.rb @@ -23,15 +23,19 @@ describe 'basic nova' do 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', }, },