diff --git a/attributes/default.rb b/attributes/default.rb index a8b4da67..be49327b 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -133,10 +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' -# 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 diff --git a/recipes/default.rb b/recipes/default.rb index 26f1de77..4905ccee 100644 --- a/recipes/default.rb +++ b/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 diff --git a/spec/default-redhat_spec.rb b/spec/default-redhat_spec.rb index 96bb3a60..29fbc863 100644 --- a/spec/default-redhat_spec.rb +++ b/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 @@ -76,10 +65,6 @@ 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