Merge "Add RDO testing repo for CentOS"

attributes/default.rb

@@ -135,6 +135,8 @@ default['openstack']['zypp']['uri'] = 'http://download.opensuse.org/repositories
 default['openstack']['yum']['rdo_enabled'] = true
 default['openstack']['yum']['rdo_delorean_enabled'] = false
 default['openstack']['yum']['uri'] = 'http://repos.fedorapeople.org/repos/openstack/openstack-kilo/el7'
+# Add rdo-testing repo from rdo-release.rpm
+default['openstack']['yum']['testing-uri'] = 'http://repos.fedorapeople.org/repos/openstack/openstack-kilo/testing/el7'
 default['openstack']['yum']['repo-key'] = 'https://raw.githubusercontent.com/redhat-openstack/rdo-release/master/RPM-GPG-KEY-RDO-kilo'
 # Enforcing GnuPG signature check for RDO repo. Set this to false if you want to disable the check.
 default['openstack']['yum']['gpgcheck'] = true

recipes/default.rb

@@ -62,6 +62,15 @@ 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'

spec/default-redhat_spec.rb

@@ -24,6 +24,11 @@ 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