From 9bf2da101c152636a2e688881cbca2e43ac92bae Mon Sep 17 00:00:00 2001 From: Samuel Cassiba Date: Mon, 18 Apr 2016 08:31:50 -0700 Subject: [PATCH] Split apt_components for bare metal provisioning The openstack-ppa.list file gets generated with an extra 'trusty' resulting in a failed convergence on bare metal nodes. Change-Id: I22235c3eed6a9abd0371d86ea80b71e4702e9ea4 --- attributes/default.rb | 2 +- recipes/default.rb | 6 +----- spec/default_spec.rb | 6 ++++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index b64c5bb7..8f84c305 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -126,7 +126,7 @@ default['openstack']['release'] = 'mitaka' 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'] = ["#{node['lsb']['codename']}-updates/#{node['openstack']['release']}", 'main'] +default['openstack']['apt']['components'] = ['main'] # For the SRU packaging, use this: # default['openstack']['apt']['components'] = [ '%codename%-proposed/%release%', 'main' ] diff --git a/recipes/default.rb b/recipes/default.rb index 21601791..5e5ebc48 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -32,13 +32,9 @@ when 'debian' if node['openstack']['apt']['live_updates_enabled'] apt_components = node['openstack']['apt']['components'] - # Simple variable substitution for LSB codename and OpenStack release - apt_components.each do |comp| - comp.gsub! '%release%', node['openstack']['release'] - comp.gsub! '%codename%', node['lsb']['codename'] - end apt_repository 'openstack-ppa' do uri node['openstack']['apt']['uri'] + distribution "#{node['lsb']['codename']}-updates/#{node['openstack']['release']}" components apt_components end end diff --git a/spec/default_spec.rb b/spec/default_spec.rb index 0bca40b5..8a931783 100644 --- a/spec/default_spec.rb +++ b/spec/default_spec.rb @@ -29,14 +29,16 @@ describe 'openstack-common::default' do node.set['openstack']['apt']['live_updates_enabled'] = true expect(chef_run).to add_apt_repository('openstack-ppa').with( uri: 'http://ubuntu-cloud.archive.canonical.com/ubuntu', - components: ['trusty-updates/mitaka', 'main']) + distribution: 'trusty-updates/mitaka', + components: ['main']) end it 'disables openstack live updates' do node.set['openstack']['apt']['live_updates_enabled'] = false expect(chef_run).to_not add_apt_repository('openstack-ppa').with( uri: 'http://ubuntu-cloud.archive.canonical.com/ubuntu', - components: ['trusty-updates/mitaka', 'main']) + distribution: 'trusty-updates/mitaka', + components: ['main']) end it 'does not install the gem chef-vault by default' do