Merge "Switch to correct Newton package locations"

attributes/default.rb

@@ -128,10 +128,10 @@ default['openstack']['release'] = 'newton'
 default['openstack']['apt']['update_apt_cache'] = false
 default['openstack']['apt']['live_updates_enabled'] = true
 default['openstack']['apt']['uri'] = 'http://ubuntu-cloud.archive.canonical.com/ubuntu'
-default['openstack']['apt']['components'] = ["xenial-proposed/#{node['openstack']['release']}", 'main']
+default['openstack']['apt']['components'] = ['main']
 
 default['openstack']['yum']['rdo_enabled'] = true
-default['openstack']['yum']['uri'] = 'https://trunk.rdoproject.org/centos7-master/84/8e/848ec9021b5fa528b08b5e4459f461dc51dc9f7c_d5612b91/'
+default['openstack']['yum']['uri'] = "http://mirror.centos.org/centos/$releasever/cloud/$basearch/openstack-#{node['openstack']['release']}"
 default['openstack']['yum']['repo-key'] = "https://github.com/redhat-openstack/rdo-release/raw/#{node['openstack']['release']}/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'] = false

recipes/default.rb

@@ -57,14 +57,6 @@ when 'rhel'
     enabled true
     action repo_action
   end
-
-  yum_repository 'RDO-newton-deps' do
-    description 'Newton delorean-deps'
-    baseurl 'http://buildlogs.centos.org/centos/7/cloud/x86_64/openstack-newton'
-    gpgcheck false
-    enabled true
-    action repo_action
-  end
 end
 
 if node['openstack']['databag_type'] == 'vault'

spec/default_spec.rb

@@ -30,7 +30,7 @@ describe 'openstack-common::default' do
       expect(chef_run).to add_apt_repository('openstack-ppa').with(
         uri: 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
         distribution: 'xenial-updates/newton',
-        components: ['xenial-proposed/newton', 'main'])
+        components: ['main'])
     end
 
     it 'disables openstack live updates' do
@@ -38,7 +38,7 @@ describe 'openstack-common::default' do
       expect(chef_run).to_not add_apt_repository('openstack-ppa').with(
         uri: 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
         distribution: 'xenial-updates/newton',
-        components: ['xenial-proposed/newton', 'main'])
+        components: ['main'])
     end
 
     it 'does not install the gem chef-vault by default' do