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: I3e313e9f9b5adb10786a7f95a53e5254dda8466b
Implements: blueprint allow-package-updates

CHANGELOG.md

@@ -1,6 +1,9 @@
 # CHANGELOG for cookbook-openstack-common
 
 This file is used to list changes made in each version of cookbook-openstack-common.
+## 9.2.1
+* Fix package action to allow updates
+
 ## 9.2.0
 * Add recipe for openrc file (moved from compute cookbook)
 

metadata.rb

@@ -4,7 +4,7 @@ maintainer_email 'cookbooks@lists.tfoundry.com'
 license          'Apache 2.0'
 description      'Common OpenStack attributes, libraries and recipes.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '9.2.0'
+version          '9.2.1'
 
 recipe           'openstack-common', 'Installs/Configures common recipes'
 recipe           'openstack-common::set_endpoints_by_interface', 'Set endpoints by interface'

recipes/default.rb

@@ -18,10 +18,12 @@
 # limitations under the License.
 #
 
+platform_options = node['openstack']['common']['platform']
 case node['platform_family']
 when 'debian'
   package 'ubuntu-cloud-keyring' do
-    action :install
+    options platform_options['package_overrides']
+    action :upgrade
   end
 
   if node['openstack']['apt']['live_updates_enabled']

spec/client-redhat_spec.rb

@@ -11,7 +11,7 @@ describe 'openstack-common::client' do
       runner.converge(described_recipe)
     end
 
-    it 'installs common client packages' do
+    it 'upgrades common client packages' do
       expect(chef_run).to upgrade_package('python-openstackclient')
     end
   end

spec/client_spec.rb

@@ -11,7 +11,7 @@ describe 'openstack-common::client' do
       runner.converge(described_recipe)
     end
 
-    it 'installs common client packages' do
+    it 'upgrades common client packages' do
       expect(chef_run).to upgrade_package('python-openstackclient')
     end
   end

spec/default_spec.rb

@@ -11,8 +11,8 @@ describe 'openstack-common::default' do
       runner.converge(described_recipe)
     end
 
-    it 'installs ubuntu-cloud-keyring package' do
-      expect(chef_run).to install_package 'ubuntu-cloud-keyring'
+    it 'upgrades ubuntu-cloud-keyring package' do
+      expect(chef_run).to upgrade_package 'ubuntu-cloud-keyring'
     end
 
     it 'configures openstack repository' do