From ea29622cba7ed999e8c688cbc81817f0ca4a8ed8 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 10 Sep 2015 12:13:16 -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: I5a5643b811ee972c18de73ab6d2ad4ff477593de --- spec/acceptance/basic_neutron_spec.rb | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/spec/acceptance/basic_neutron_spec.rb b/spec/acceptance/basic_neutron_spec.rb index a9215df39..fdee5aeb5 100644 --- a/spec/acceptance/basic_neutron_spec.rb +++ b/spec/acceptance/basic_neutron_spec.rb @@ -23,15 +23,19 @@ describe 'basic neutron' 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', }, },