Point CentOS package source of truth to mirror.centos.org

This removes the additional RDO-testing and RDO-Manager repos in
favor of mirror.centos.org

Change-Id: I89157c03fcccb8a1378b61c4cc6ffd8f59d91991

attributes/default.rb

@@ -133,11 +133,8 @@ default['openstack']['zypp']['repo-key'] = 'd85f9316'  # 32 bit key ID
 default['openstack']['zypp']['uri'] = 'http://download.opensuse.org/repositories/Cloud:/OpenStack:/%release%/%suse-release%/'
 
 default['openstack']['yum']['rdo_enabled'] = true
-default['openstack']['yum']['rdo_delorean_enabled'] = false
-default['openstack']['yum']['uri'] = 'http://repos.fedorapeople.org/repos/openstack/openstack-liberty/el7'
-# Add rdo-testing repo from rdo-release.rpm
-default['openstack']['yum']['testing-uri'] = 'http://repos.fedorapeople.org/repos/openstack/openstack-liberty/testing/el7'
-default['openstack']['yum']['repo-key'] = 'https://raw.githubusercontent.com/redhat-openstack/rdo-release/master/RPM-GPG-KEY-RDO-liberty'
+default['openstack']['yum']['uri'] = "http://mirror.centos.org/centos/$releasever/cloud/$basearch/openstack-#{node['openstack']['release']}"
+default['openstack']['yum']['repo-key'] = 'https://raw.githubusercontent.com/redhat-openstack/rdo-release/master/RPM-GPG-KEY-CentOS-SIG-Cloud'
 # Enforcing GnuPG signature check for RDO repo. Set this to false if you want to disable the check.
 default['openstack']['yum']['gpgcheck'] = true
 # ======================== OpenStack Endpoints ================================

recipes/default.rb

@@ -62,24 +62,6 @@ when 'rhel'
     action repo_action
   end
 
-  yum_repository "RDO-#{node['openstack']['release']}-testing" do
-    description "OpenStack RDO testing repo for #{node['openstack']['release']}"
-    baseurl node['openstack']['yum']['testing-uri']
-    gpgcheck false
-    enabled true
-    action repo_action
-  end
-
-  # Bring in RDO-Manager repos
-  remote_file '/etc/yum.repos.d/rdo-manager-release.repo' do
-    source 'https://raw.githubusercontent.com/rdo-management/rdo-manager-release/master/rdo-manager-release.repo'
-    owner 'root'
-    group 'root'
-    mode '00644'
-    action :create
-    only_if { node['openstack']['yum']['rdo_delorean_enabled'] }
-  end
-
 when 'suse'
   if node['lsb']['description'].nil?
     # Ohai lsb does not work at all on SLES11SP3

spec/default-redhat_spec.rb

@@ -14,7 +14,6 @@ describe 'openstack-common::default' do
     context 'enabling RDO with gpgcheck enabled' do
       before do
         node.set['openstack']['yum']['rdo_enabled'] = true
-        node.set['openstack']['yum']['rdo_delorean_enabled'] = true
       end
 
       it 'adds RDO yum repository' do
@@ -24,19 +23,9 @@ describe 'openstack-common::default' do
           .with(gpgcheck: true)
       end
 
-      it 'adds RDO testing yum repository' do
-        expect(chef_run).to add_yum_repository('RDO-testrelease-testing')
-          .with(gpgcheck: false)
-      end
-
       it 'includes yum-epel recipe' do
         expect(chef_run).to include_recipe('yum-epel')
       end
-
-      it 'adds RDO-Manager repositories' do
-        expect(chef_run).to create_remote_file('/etc/yum.repos.d/rdo-manager-release.repo').with(
-          source: 'https://raw.githubusercontent.com/rdo-management/rdo-manager-release/master/rdo-manager-release.repo')
-      end
     end
 
     context 'enabling RDO with gpgcheck disabled' do