Merge "Add RDO-Manager yum repos"

attributes/default.rb

@@ -133,6 +133,7 @@ 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-kilo/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.

recipes/default.rb

@@ -62,6 +62,15 @@ when 'rhel'
     action repo_action
   end
 
+  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,6 +14,7 @@ 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
@@ -26,6 +27,11 @@ describe 'openstack-common::default' do
       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
@@ -65,6 +71,10 @@ describe 'openstack-common::default' do
       it 'does not include yum-epel recipe' do
         expect(chef_run).to_not include_recipe('yum-epel')
       end
+
+      it 'does not create RDO-Manager yum repositories' do
+        expect(chef_run).to_not create_remote_file('/etc/yum.repos.d/rdo-manager-release.repo')
+      end
     end
   end
 end