Allow packages to be updatable

In order for package updates to occur, package resources need to use
the upgrade action.  This is first phase of blueprint, to get some
consistency, next phase is to allow some update control.

Change-Id: I86750067b47766220f497303b2e187c93aeadc2f
Implements: blueprint allow-package-updates

CHANGELOG.md

@@ -1,6 +1,9 @@
 # CHANGELOG for cookbook-openstack-network
 
 This file is used to list changes made in each version of cookbook-openstack-network.
+## 9.0.1
+* Fix package action to allow updates
+
 ## 9.0.0
 * Upgrade to Icehouse
 * The balancer recipe now includes openstack-network::common

metadata.rb

@@ -5,7 +5,7 @@ maintainer        'Jay Pipes <jaypipes@gmail.com>'
 license           'Apache 2.0'
 description       'Installs and configures the OpenStack Network API Service and various agents and plugins'
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version           '9.0.0'
+version           '9.0.1'
 recipe            'openstack-network::client', 'Install packages required for network client'
 recipe            'openstack-network::server', 'Installs packages required for a OpenStack Network server'
 recipe            'openstack-network::openvswitch', 'Installs packages required for OVS'

recipes/balancer.rb

@@ -29,7 +29,8 @@ platform_options = node['openstack']['network']['platform']
 
 platform_options['neutron_lb_packages'].each do |pkg|
   package pkg do
-    action :install
+    options platform_options['package_overrides']
+    action :upgrade
   end
 end
 

recipes/common.rb

@@ -52,7 +52,7 @@ end
 platform_options['neutron_packages'].each do |pkg|
   package pkg do
     options platform_options['package_overrides']
-    action :install
+    action :upgrade
   end
 end
 
@@ -60,7 +60,7 @@ db_type = node['openstack']['db']['network']['service_type']
 platform_options["#{db_type}_python_packages"].each do |pkg|
   package pkg do
     options platform_options['package_overrides']
-    action :install
+    action :upgrade
   end
 end
 

recipes/dhcp_agent.rb

@@ -29,7 +29,7 @@ main_plugin = node['openstack']['network']['core_plugin_map'][core_plugin.split(
 platform_options['neutron_dhcp_packages'].each do |pkg|
   package pkg do
     options platform_options['package_overrides']
-    action :install
+    action :upgrade
   end
 end
 
@@ -45,7 +45,7 @@ end
 # Python package and include the plugin-specific recipe here...
 package platform_options['neutron_plugin_package'].gsub('%plugin%', main_plugin) do
   options platform_options['package_overrides']
-  action :install
+  action :upgrade
   # plugins are installed by the main openstack-neutron package on SUSE
   not_if { platform_family? 'suse' }
 end
@@ -80,7 +80,7 @@ end
 if node['lsb'] && node['lsb']['codename'] == 'precise' && node['openstack']['network']['dhcp']['dnsmasq_compile'] == true
   platform_options['neutron_dhcp_build_packages'].each do |pkg|
     package pkg do
-      action :install
+      action :upgrade
     end
   end
 

recipes/l3_agent.rb

@@ -29,7 +29,7 @@ main_plugin = node['openstack']['network']['core_plugin_map'][core_plugin.split(
 platform_options['neutron_l3_packages'].each do |pkg|
   package pkg do
     options platform_options['package_overrides']
-    action :install
+    action :upgrade
     # The providers below do not use the generic L3 agent...
     not_if { ['nicira', 'plumgrid', 'bigswitch'].include?(main_plugin) }
   end

recipes/linuxbridge.rb

@@ -27,7 +27,7 @@ platform_options = node['openstack']['network']['platform']
 platform_options['neutron_linuxbridge_agent_packages'].each do |pkg|
   package pkg do
     options platform_options['package_overrides']
-    action :install
+    action :upgrade
   end
 end
 

recipes/metadata_agent.rb

@@ -44,7 +44,7 @@ end
 
 platform_options['neutron_metadata_agent_packages'].each do |pkg|
   package pkg do
-    action :install
+    action :upgrade
     options platform_options['package_overrides']
   end
 end

recipes/openvswitch.rb

@@ -40,7 +40,7 @@ if platform_family?('debian')
   kernel_ver = node['kernel']['release']
   package "linux-headers-#{kernel_ver}" do
     options platform_options['package_overrides']
-    action :install
+    action :upgrade
   end
 
 end
@@ -53,7 +53,7 @@ else
   platform_options['neutron_openvswitch_packages'].each do |pkg|
     package pkg do
       options platform_options['package_overrides']
-      action :install
+      action :upgrade
     end
   end
 end
@@ -92,7 +92,7 @@ end
 
 platform_options['neutron_openvswitch_agent_packages'].each do |pkg|
   package pkg do
-    action :install
+    action :upgrade
     options platform_options['package_overrides']
   end
 end
@@ -129,7 +129,7 @@ end
 if node['openstack']['network']['disable_offload']
 
   package 'ethtool' do
-    action :install
+    action :upgrade
     options platform_options['package_overrides']
   end
 

recipes/server.rb

@@ -34,7 +34,7 @@ core_plugin = node['openstack']['network']['core_plugin']
 platform_options['neutron_server_packages'].each do |pkg|
   package pkg do
     options platform_options['package_overrides']
-    action :install
+    action :upgrade
   end
 end
 

spec/balancer-redhat_spec.rb

@@ -14,8 +14,8 @@ describe 'openstack-network::balancer' do
     include_context 'neutron-stubs'
 
     ['haproxy', 'openstack-neutron'].each do |pack|
-      it "installs #{pack} package" do
-        expect(chef_run).to install_package(pack)
+      it "upgrades #{pack} package" do
+        expect(chef_run).to upgrade_package(pack)
       end
     end
 

spec/balancer-suse_spec.rb

@@ -14,8 +14,8 @@ describe 'openstack-network::balancer' do
     include_context 'neutron-stubs'
 
     ['openstack-neutron-lbaas-agent'].each do |pack|
-      it "installs #{pack} package" do
-        expect(chef_run).to install_package(pack)
+      it "upgrades #{pack} package" do
+        expect(chef_run).to upgrade_package(pack)
       end
     end
 

spec/balancer_spec.rb

@@ -17,15 +17,15 @@ describe 'openstack-network::balancer' do
       expect(chef_run.service('neutron-lb-agent')).to subscribe_to('template[/etc/neutron/neutron.conf]').delayed
     end
 
-    it 'does not install neutron-lbaas-agent when nova networking.' do
+    it 'does not upgrade neutron-lbaas-agent when nova networking.' do
       node.override['openstack']['compute']['network']['service_type'] = 'nova'
 
-      expect(chef_run).to_not install_package('neutron-lbaas-agent')
+      expect(chef_run).to_not upgrade_package('neutron-lbaas-agent')
     end
 
     ['haproxy', 'neutron-lbaas-agent'].each do |pack|
-      it "installs #{pack} package" do
-        expect(chef_run).to install_package(pack)
+      it "upgrades #{pack} package" do
+        expect(chef_run).to upgrade_package(pack)
       end
     end
 

spec/client-redhat_spec.rb

@@ -9,7 +9,7 @@ describe 'openstack-network::client' do
       runner.converge(described_recipe)
     end
 
-    it 'installs packages' do
+    it 'upgrades python neutron client package' do
       expect(chef_run).to upgrade_package('python-neutronclient')
     end
   end

spec/client_spec.rb

@@ -9,7 +9,7 @@ describe 'openstack-network::client' do
       runner.converge(described_recipe)
     end
 
-    it 'installs packages' do
+    it 'upgrades python neutron client package' do
       expect(chef_run).to upgrade_package('python-neutronclient')
       expect(chef_run).to upgrade_package('python-pyparsing')
     end

spec/common-redhat_spec.rb

@@ -13,15 +13,15 @@ describe 'openstack-network::common' do
 
     include_context 'neutron-stubs'
 
-    it 'installs mysql python packages by default' do
-      expect(chef_run).to install_package('MySQL-python')
+    it 'upgrades mysql python package' do
+      expect(chef_run).to upgrade_package('MySQL-python')
     end
 
-    it 'installs db2 python packages if explicitly told' do
+    it 'upgrades db2 python packages if explicitly told' do
       node.set['openstack']['db']['network']['service_type'] = 'db2'
 
       ['python-ibm-db', 'python-ibm-db-sa'].each do |pkg|
-        expect(chef_run).to install_package(pkg)
+        expect(chef_run).to upgrade_package(pkg)
       end
     end
   end

spec/common_spec.rb

@@ -13,22 +13,22 @@ describe 'openstack-network::common' do
 
     include_context 'neutron-stubs'
 
-    it 'does not install python-neutronclient when nova networking' do
+    it 'does not upgrade python-neutronclient when nova networking' do
       node.override['openstack']['compute']['network']['service_type'] = 'nova'
 
-      expect(chef_run).to_not install_package('python-neutronclient')
+      expect(chef_run).to_not upgrade_package('python-neutronclient')
     end
 
-    it 'upgrades python neutronclient' do
+    it 'upgrades python neutronclient package' do
       expect(chef_run).to upgrade_package('python-neutronclient')
     end
 
-    it 'upgrades python pyparsing' do
+    it 'upgrades python pyparsing package' do
       expect(chef_run).to upgrade_package('python-pyparsing')
     end
 
-    it 'installs mysql python packages by default' do
-      expect(chef_run).to install_package('python-mysqldb')
+    it 'upgrades mysql python package' do
+      expect(chef_run).to upgrade_package('python-mysqldb')
     end
 
     describe 'neutron.conf' do

spec/dhcp_agent-suse_spec.rb

@@ -16,16 +16,16 @@ describe 'openstack-network::dhcp_agent' do
     it 'does not install openstack-neutron-dhcp-agent when nova networking' do
       node.override['openstack']['compute']['network']['service_type'] = 'nova'
 
-      expect(chef_run).to_not install_package('openstack-neutron-dhcp-agent')
+      expect(chef_run).to_not upgrade_package('openstack-neutron-dhcp-agent')
     end
 
-    it 'installs quamtum dhcp package' do
-      expect(chef_run).to install_package('openstack-neutron-dhcp-agent')
+    it 'upgrades neutron dhcp package' do
+      expect(chef_run).to upgrade_package('openstack-neutron-dhcp-agent')
     end
 
-    it 'installs plugin packages' do
-      expect(chef_run).not_to install_package(/openvswitch/)
-      expect(chef_run).not_to install_package(/plugin/)
+    it 'upgrades plugin packages' do
+      expect(chef_run).not_to upgrade_package(/openvswitch/)
+      expect(chef_run).not_to upgrade_package(/plugin/)
     end
 
     it 'starts the dhcp agent on boot' do

spec/dhcp_agent_spec.rb

@@ -24,9 +24,9 @@ describe 'openstack-network::dhcp_agent' do
 
     # since our mocked version of ubuntu is precise, our compile
     # utilities should be installed to build dnsmasq
-    it 'installs dnsmasq build dependencies' do
+    it 'upgrades dnsmasq build dependencies' do
       %w(build-essential pkg-config libidn11-dev libdbus-1-dev libnetfilter-conntrack-dev gettext).each do |pkg|
-        expect(chef_run).to install_package pkg
+        expect(chef_run).to upgrade_package pkg
       end
     end
 
@@ -34,16 +34,16 @@ describe 'openstack-network::dhcp_agent' do
       node.set['openstack']['network']['dhcp']['dnsmasq_compile'] = false
 
       %w(build-essential pkg-config libidn11-dev libdbus-1-dev libnetfilter-conntrack-dev gettext).each do |pkg|
-        expect(chef_run).to_not install_package pkg
+        expect(chef_run).to_not upgrade_package pkg
       end
     end
 
-    it 'installs neutron dhcp package' do
-      expect(chef_run).to install_package 'neutron-dhcp-agent'
+    it 'upgrades neutron dhcp package' do
+      expect(chef_run).to upgrade_package 'neutron-dhcp-agent'
     end
 
-    it 'installs plugin packages' do
-      expect(chef_run).to install_package 'neutron-plugin-ml2'
+    it 'upgrades plugin package' do
+      expect(chef_run).to upgrade_package 'neutron-plugin-ml2'
     end
 
     it 'starts the dhcp agent on boot' do

spec/l3_agent_spec.rb

@@ -26,11 +26,11 @@ describe 'openstack-network::l3_agent' do
     it 'does not install neutron l3 package when nova networking' do
       node.override['openstack']['compute']['network']['service_type'] = 'nova'
 
-      expect(chef_run).to_not install_package('neutron-l3-agent')
+      expect(chef_run).to_not upgrade_package('neutron-l3-agent')
     end
 
-    it 'installs quamtum l3 package' do
-      expect(chef_run).to install_package('neutron-l3-agent')
+    it 'upgrades neutron l3 package' do
+      expect(chef_run).to upgrade_package('neutron-l3-agent')
     end
 
     describe 'l3_agent.ini' do

spec/linuxbridge-redhat_spec.rb

@@ -19,11 +19,11 @@ describe 'openstack-network::linuxbridge' do
     it 'does not install linuxbridge agent package when nova networking' do
       node.override['openstack']['compute']['network']['service_type'] = 'nova'
 
-      expect(chef_run).to_not install_package('openstack-neutron-linuxbridge')
+      expect(chef_run).to_not upgrade_package('openstack-neutron-linuxbridge')
     end
 
-    it 'installs linuxbridge agent' do
-      expect(chef_run).to install_package('openstack-neutron-linuxbridge')
+    it 'upgrades linuxbridge agent' do
+      expect(chef_run).to upgrade_package('openstack-neutron-linuxbridge')
     end
 
     it 'sets the linuxbridge service to start on boot' do

spec/linuxbridge-suse_spec.rb

@@ -18,11 +18,11 @@ describe 'openstack-network::linuxbridge' do
     it 'does not install linuxbridge agent package when nova networking' do
       node.override['openstack']['compute']['network']['service_type'] = 'nova'
 
-      expect(chef_run).to_not install_package('openstack-neutron-linuxbridge-agent')
+      expect(chef_run).to_not upgrade_package('openstack-neutron-linuxbridge-agent')
     end
 
-    it 'installs linuxbridge agent' do
-      expect(chef_run).to install_package('openstack-neutron-linuxbridge-agent')
+    it 'upgrades linuxbridge agent' do
+      expect(chef_run).to upgrade_package('openstack-neutron-linuxbridge-agent')
     end
 
     it 'sets the linuxbridge service to start on boot' do

spec/linuxbridge_spec.rb

@@ -18,11 +18,11 @@ describe 'openstack-network::linuxbridge' do
     it 'does not install linuxbridge agent package when nova networking' do
       node.override['openstack']['compute']['network']['service_type'] = 'nova'
 
-      expect(chef_run).to_not install_package('neutron-plugin-linuxbridge-agent')
+      expect(chef_run).to_not upgrade_package('neutron-plugin-linuxbridge-agent')
     end
 
-    it 'installs linuxbridge agent' do
-      expect(chef_run).to install_package('neutron-plugin-linuxbridge-agent')
+    it 'upgrades linuxbridge agent' do
+      expect(chef_run).to upgrade_package('neutron-plugin-linuxbridge-agent')
     end
 
     it 'sets the linuxbridge service to start on boot' do

spec/metadata_agent_spec.rb

@@ -12,14 +12,14 @@ describe 'openstack-network::metadata_agent' do
 
     include_context 'neutron-stubs'
 
-    it 'does not install quamtum metadata agent when nova networking' do
+    it 'does not install neutron metadata agent when nova networking' do
       node.override['openstack']['compute']['network']['service_type'] = 'nova'
 
-      expect(chef_run).to_not install_package 'neutron-metadata-agent'
+      expect(chef_run).to_not upgrade_package 'neutron-metadata-agent'
     end
 
-    it 'installs quamtum metadata agent' do
-      expect(chef_run).to install_package 'neutron-metadata-agent'
+    it 'upgrades neutron metadata agent' do
+      expect(chef_run).to upgrade_package 'neutron-metadata-agent'
     end
 
     it 'subscribes the metadata agent service to neutron.conf' do

spec/openvswitch-suse_spec.rb

@@ -16,15 +16,15 @@ describe 'openstack-network::openvswitch' do
     it 'does not install openvswitch package when nova networking' do
       node.override['openstack']['compute']['network']['service_type'] = 'nova'
 
-      expect(chef_run).to_not install_package 'openvswitch-switch'
+      expect(chef_run).to_not upgrade_package 'openvswitch-switch'
     end
 
-    it 'installs the openvswitch package' do
-      expect(chef_run).to install_package 'openvswitch-switch'
+    it 'upgrades the openvswitch package' do
+      expect(chef_run).to upgrade_package 'openvswitch-switch'
     end
 
-    it 'installs the openvswitch-agent package' do
-      expect(chef_run).to install_package 'openstack-neutron-openvswitch-agent'
+    it 'upgrades the openvswitch-agent package' do
+      expect(chef_run).to upgrade_package 'openstack-neutron-openvswitch-agent'
     end
 
     it 'starts the openvswitch-switch service' do

spec/openvswitch_spec.rb

@@ -21,23 +21,23 @@ describe 'openstack-network::openvswitch' do
     it 'does not install openvswitch switch when nova networking' do
       node.override['openstack']['compute']['network']['service_type'] = 'nova'
 
-      expect(chef_run).to_not install_package 'openvswitch-switch'
+      expect(chef_run).to_not upgrade_package 'openvswitch-switch'
     end
 
-    it 'installs openvswitch switch' do
-      expect(chef_run).to install_package 'openvswitch-switch'
+    it 'upgrades openvswitch switch' do
+      expect(chef_run).to upgrade_package 'openvswitch-switch'
     end
 
-    it 'installs openvswitch datapath dkms' do
-      expect(chef_run).to install_package 'openvswitch-datapath-dkms'
+    it 'upgrades openvswitch datapath dkms' do
+      expect(chef_run).to upgrade_package 'openvswitch-datapath-dkms'
     end
 
-    it 'installs linux bridge utils' do
-      expect(chef_run).to install_package 'bridge-utils'
+    it 'upgrades linux bridge utils' do
+      expect(chef_run).to upgrade_package 'bridge-utils'
     end
 
-    it 'installs linux linux headers' do
-      expect(chef_run).to install_package 'linux-headers-1.2.3'
+    it 'upgrades linux linux headers' do
+      expect(chef_run).to upgrade_package 'linux-headers-1.2.3'
     end
 
     it 'sets the openvswitch service to start on boot' do
@@ -52,8 +52,8 @@ describe 'openstack-network::openvswitch' do
       expect(chef_run.service('neutron-plugin-openvswitch-agent')).to subscribe_to('template[/etc/neutron/neutron.conf]').delayed
     end
 
-    it 'installs openvswitch agent' do
-      expect(chef_run).to install_package 'neutron-plugin-openvswitch-agent'
+    it 'upgrades openvswitch agent' do
+      expect(chef_run).to upgrade_package 'neutron-plugin-openvswitch-agent'
     end
 
     it 'sets the openvswitch service to start on boot' do
@@ -73,7 +73,7 @@ describe 'openstack-network::openvswitch' do
       node.set['openstack']['network']['platform']['package_overrides'] = '--my-override1 --my-override2'
 
       %w{openvswitch-switch openvswitch-datapath-dkms neutron-plugin-openvswitch neutron-plugin-openvswitch-agent}.each do |pkg|
-        expect(chef_run).to install_package(pkg).with(options: '--my-override1 --my-override2')
+        expect(chef_run).to upgrade_package(pkg).with(options: '--my-override1 --my-override2')
       end
     end
 
@@ -82,7 +82,7 @@ describe 'openstack-network::openvswitch' do
       node.set['openstack']['network']['platform']['neutron_openvswitch_agent_packages'] = ['my-openvswitch-agent', 'my-other-openvswitch-agent']
 
       %w{my-openvswitch my-other-openvswitch my-openvswitch-agent my-other-openvswitch-agent}.each do |pkg|
-        expect(chef_run).to install_package(pkg)
+        expect(chef_run).to upgrade_package(pkg)
       end
     end
 

spec/server-redhat_spec.rb

@@ -15,19 +15,19 @@ describe 'openstack-network::server' do
     it 'does not install openstack-neutron when nova networking' do
       node.override['openstack']['compute']['network']['service_type'] = 'nova'
 
-      expect(chef_run).to_not install_package 'openstack-neutron'
+      expect(chef_run).to_not upgrade_package 'openstack-neutron'
     end
 
-    it 'installs openstack-neutron packages' do
-      expect(chef_run).to install_package 'openstack-neutron'
+    it 'upgrades openstack-neutron packages' do
+      expect(chef_run).to upgrade_package 'openstack-neutron'
     end
 
     it 'enables openstack-neutron server service' do
       expect(chef_run).to enable_service 'neutron-server'
     end
 
-    it 'does not install openvswitch package' do
-      expect(chef_run).not_to install_package 'openvswitch'
+    it 'does not upgrade openvswitch package' do
+      expect(chef_run).not_to upgrade_package 'openvswitch'
       expect(chef_run).not_to enable_service 'neutron-openvswitch-agent'
     end
   end

spec/server-suse_spec.rb

@@ -15,19 +15,19 @@ describe 'openstack-network::server' do
     it 'does not install openstack-neutron when nova networking' do
       node.override['openstack']['compute']['network']['service_type'] = 'nova'
 
-      expect(chef_run).to_not install_package 'openstack-neutron'
+      expect(chef_run).to_not upgrade_package 'openstack-neutron'
     end
 
-    it 'installs openstack-neutron packages' do
-      expect(chef_run).to install_package 'openstack-neutron'
+    it 'upgrades openstack-neutron packages' do
+      expect(chef_run).to upgrade_package 'openstack-neutron'
     end
 
     it 'enables openstack-neutron service' do
       expect(chef_run).to enable_service 'openstack-neutron'
     end
 
-    it 'does not install openvswitch package' do
-      expect(chef_run).not_to install_package 'openstack-neutron-openvswitch'
+    it 'does not upgrade openvswitch package' do
+      expect(chef_run).not_to upgrade_package 'openstack-neutron-openvswitch'
     end
 
     describe '/etc/sysconfig/neutron' do

spec/server_spec.rb

@@ -20,12 +20,12 @@ describe 'openstack-network::server' do
 
     it 'does not install neutron-server when nova networking' do
       node.override['openstack']['compute']['network']['service_type'] = 'nova'
-      expect(chef_run).to_not install_package 'neutron-server'
+      expect(chef_run).to_not upgrade_package 'neutron-server'
     end
 
     describe 'package and services' do
-      it 'installs neutron-server packages' do
-        expect(chef_run).to install_package 'neutron-server'
+      it 'upgrades neutron-server packages' do
+        expect(chef_run).to upgrade_package 'neutron-server'
       end
 
       it 'allows overriding package names' do
@@ -33,7 +33,7 @@ describe 'openstack-network::server' do
         node.set['openstack']['network']['platform']['neutron_server_packages'] = cust_pkgs
 
         cust_pkgs.each do |pkg|
-          expect(chef_run).to install_package(pkg)
+          expect(chef_run).to upgrade_package(pkg)
         end
       end
 
@@ -51,12 +51,12 @@ describe 'openstack-network::server' do
         cust_opts = "-o Dpkg::Options::='--force-confold' -o Dpkg::Options::='--force-confdef' --force-yes"
         node.set['openstack']['network']['platform']['package_overrides'] = cust_opts
 
-        expect(chef_run).to install_package('neutron-server').with(options: cust_opts)
+        expect(chef_run).to upgrade_package('neutron-server').with(options: cust_opts)
       end
 
-      it 'does not install openvswitch package or the agent' do
-        expect(chef_run).not_to install_package 'openvswitch'
-        expect(chef_run).not_to install_package 'neutron-plugin-openvswitch-agent'
+      it 'does not upgrade openvswitch package or the agent' do
+        expect(chef_run).not_to upgrade_package 'openvswitch'
+        expect(chef_run).not_to upgrade_package 'neutron-plugin-openvswitch-agent'
         expect(chef_run).not_to enable_service 'neutron-plugin-openvswitch-agent'
       end
     end
@@ -434,7 +434,7 @@ describe 'openstack-network::server' do
         end
       end
 
-      it 'does not install sysconfig template' do
+      it 'does not create sysconfig template' do
         stub_command(/python/).and_return(true)
         expect(chef_run).not_to create_file('/etc/sysconfig/neutron')
       end