Changed the action of all package resources from default to :upgrade

Since no version is specified for any package and usually you do not
want to stick with one unspecific version you get during your first run
the action should be :upgrade.

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

CHANGELOG.md

@@ -1,6 +1,9 @@
 openstack-telemetry Cookbook CHANGELG
 ==============================
 This file is used to list changes made in each version of the openstack-metering cookbook.
+## 9.2.0
+* Change the action of all package resources from default to :upgrade
+
 ## 9.1.2
 * Add attribute sample_source
 

metadata.rb

@@ -4,7 +4,7 @@ maintainer_email 'cookbooks@lists.tfoundry.com'
 license          'Apache 2.0'
 description      'The OpenStack Metering service Ceilometer.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '9.1.2'
+version          '9.2.0'
 
 recipe 'openstack-telemetry::agent-central', 'Installs agent central service.'
 recipe 'openstack-telemetry::agent-compute', 'Installs agent compute service.'

recipes/agent-central.rb

@@ -25,6 +25,7 @@ platform = node['openstack']['telemetry']['platform']
 platform['agent_central_packages'].each do |pkg|
   package pkg do
     options platform['package_overrides']
+    action :upgrade
   end
 end
 

recipes/agent-compute.rb

@@ -25,6 +25,7 @@ platform = node['openstack']['telemetry']['platform']
 platform['agent_compute_packages'].each do |pkg|
   package pkg do
     options platform['package_overrides']
+    action :upgrade
   end
 end
 

recipes/agent-notification.rb

@@ -24,6 +24,7 @@ platform = node['openstack']['telemetry']['platform']
 platform['agent_notification_packages'].each do |pkg|
   package pkg do
     options platform['package_overrides']
+    action :upgrade
   end
 end
 

recipes/alarm-evaluator.rb

@@ -24,6 +24,7 @@ platform = node['openstack']['telemetry']['platform']
 platform['alarm_evaluator_packages'].each do |pkg|
   package pkg do
     options platform['package_overrides']
+    action :upgrade
   end
 end
 

recipes/alarm-notifier.rb

@@ -24,6 +24,7 @@ platform = node['openstack']['telemetry']['platform']
 platform['alarm_notifier_packages'].each do |pkg|
   package pkg do
     options platform['package_overrides']
+    action :upgrade
   end
 end
 

recipes/api.rb

@@ -32,6 +32,7 @@ platform = node['openstack']['telemetry']['platform']
 platform['api_packages'].each do |pkg|
   package pkg do
     options platform['package_overrides']
+    action :upgrade
   end
 end
 

recipes/client.rb

@@ -26,7 +26,6 @@ platform = node['openstack']['telemetry']['platform']
 platform['client_packages'].each do |pkg|
   package pkg do
     options platform['package_overrides']
-
     action :upgrade
   end
 end

recipes/collector.rb

@@ -34,6 +34,7 @@ platform = node['openstack']['telemetry']['platform']
 platform['collector_packages'].each do |pkg|
   package pkg do
     options platform['package_overrides']
+    action :upgrade
   end
 end
 

recipes/common.rb

@@ -33,13 +33,14 @@ platform = node['openstack']['telemetry']['platform']
 db_type = node['openstack']['db']['telemetry']['service_type']
 platform["#{db_type}_python_packages"].each do |pkg|
   package pkg do
-    action :install
+    action :upgrade
   end
 end
 
 platform['common_packages'].each do |pkg|
   package pkg do
     options platform['package_overrides']
+    action :upgrade
   end
 end
 

spec/agent-central-rhel_spec.rb

@@ -12,7 +12,7 @@ describe 'openstack-telemetry::agent-central' do
     include_examples 'expect-runs-common-recipe'
 
     it 'installs the agent-central package' do
-      expect(chef_run).to install_package 'openstack-ceilometer-central'
+      expect(chef_run).to upgrade_package 'openstack-ceilometer-central'
     end
 
     it 'starts the agent-central service' do

spec/agent-central-suse_spec.rb

@@ -11,7 +11,7 @@ describe 'openstack-telemetry::agent-central' do
     include_context 'telemetry-stubs'
 
     it 'installs the agent-central package' do
-      expect(chef_run).to install_package 'openstack-ceilometer-agent-central'
+      expect(chef_run).to upgrade_package 'openstack-ceilometer-agent-central'
     end
 
     it 'starts the agent-central service' do

spec/agent-central_spec.rb

@@ -12,7 +12,7 @@ describe 'openstack-telemetry::agent-central' do
     include_examples 'expect-runs-common-recipe'
 
     it 'installs the agent-central package' do
-      expect(chef_run).to install_package 'ceilometer-agent-central'
+      expect(chef_run).to upgrade_package 'ceilometer-agent-central'
     end
 
     it 'starts and enables the agent-central service' do

spec/agent-compute-rhel_spec.rb

@@ -12,7 +12,7 @@ describe 'openstack-telemetry::agent-compute' do
     include_examples 'expect-runs-common-recipe'
 
     it 'installs the agent-compute package' do
-      expect(chef_run).to install_package 'openstack-ceilometer-compute'
+      expect(chef_run).to upgrade_package 'openstack-ceilometer-compute'
     end
 
     it 'starts ceilometer-agent-compute service' do

spec/agent-compute-suse_spec.rb

@@ -11,7 +11,7 @@ describe 'openstack-telemetry::agent-compute' do
     include_context 'telemetry-stubs'
 
     it 'installs the agent-compute package' do
-      expect(chef_run).to install_package 'openstack-ceilometer-agent-compute'
+      expect(chef_run).to upgrade_package 'openstack-ceilometer-agent-compute'
     end
 
     it 'starts the agent-compute service' do

spec/agent-compute_spec.rb

@@ -12,7 +12,7 @@ describe 'openstack-telemetry::agent-compute' do
     include_examples 'expect-runs-common-recipe'
 
     it 'installs the agent-compute package' do
-      expect(chef_run).to install_package 'ceilometer-agent-compute'
+      expect(chef_run).to upgrade_package 'ceilometer-agent-compute'
     end
 
     it 'enables and starts the ceilometer-agent-compute service' do

spec/agent-notification-rhel_spec.rb

@@ -12,7 +12,7 @@ describe 'openstack-telemetry::agent-notification' do
     include_examples 'expect-runs-common-recipe'
 
     it 'installs the agent-notification package' do
-      expect(chef_run).to install_package 'openstack-ceilometer-collector'
+      expect(chef_run).to upgrade_package 'openstack-ceilometer-collector'
     end
 
     it 'starts the agent-notification service' do

spec/agent-notification-suse_spec.rb

@@ -11,7 +11,7 @@ describe 'openstack-telemetry::agent-notification' do
     include_context 'telemetry-stubs'
 
     it 'installs the agent-notification package' do
-      expect(chef_run).to install_package 'openstack-ceilometer-agent-notification'
+      expect(chef_run).to upgrade_package 'openstack-ceilometer-agent-notification'
     end
 
     it 'starts the agent-notification service' do

spec/agent-notification_spec.rb

@@ -12,7 +12,7 @@ describe 'openstack-telemetry::agent-notification' do
     include_examples 'expect-runs-common-recipe'
 
     it 'installs the agent-notification package' do
-      expect(chef_run).to install_package 'ceilometer-agent-notification'
+      expect(chef_run).to upgrade_package 'ceilometer-agent-notification'
     end
 
     it 'enables and starts ceilometer-agent-notification service' do

spec/alarm-evaluator-rhel_spec.rb

@@ -12,7 +12,7 @@ describe 'openstack-telemetry::alarm-evaluator' do
     include_examples 'expect-runs-common-recipe'
 
     it 'installs the alarm-evaluator package' do
-      expect(chef_run).to install_package 'openstack-ceilometer-alarm'
+      expect(chef_run).to upgrade_package 'openstack-ceilometer-alarm'
     end
 
     it 'starts the alarm-evaluator service' do

spec/alarm-evaluator-suse_spec.rb

@@ -11,7 +11,7 @@ describe 'openstack-telemetry::alarm-evaluator' do
     include_context 'telemetry-stubs'
 
     it 'installs the alarm-evaluator package' do
-      expect(chef_run).to install_package 'openstack-ceilometer-alarm-evaluator'
+      expect(chef_run).to upgrade_package 'openstack-ceilometer-alarm-evaluator'
     end
 
     it 'starts the alarm-evaluator service' do

spec/alarm-evaluator_spec.rb

@@ -12,7 +12,7 @@ describe 'openstack-telemetry::alarm-evaluator' do
     include_examples 'expect-runs-common-recipe'
 
     it 'installs the alarm-evaluator package' do
-      expect(chef_run).to install_package 'ceilometer-alarm-evaluator'
+      expect(chef_run).to upgrade_package 'ceilometer-alarm-evaluator'
     end
 
     it 'starts and enables the alarm-evaluator service' do

spec/alarm-notifier-rhel_spec.rb

@@ -12,7 +12,7 @@ describe 'openstack-telemetry::alarm-notifier' do
     include_examples 'expect-runs-common-recipe'
 
     it 'installs the alarm-notifier package' do
-      expect(chef_run).to install_package 'openstack-ceilometer-alarm'
+      expect(chef_run).to upgrade_package 'openstack-ceilometer-alarm'
     end
 
     it 'starts the alarm-notifier service' do

spec/alarm-notifier-suse_spec.rb

@@ -11,7 +11,7 @@ describe 'openstack-telemetry::alarm-notifier' do
     include_context 'telemetry-stubs'
 
     it 'installs the alarm-notifier package' do
-      expect(chef_run).to install_package 'openstack-ceilometer-alarm-notifier'
+      expect(chef_run).to upgrade_package 'openstack-ceilometer-alarm-notifier'
     end
 
     it 'starts the alarm-notifier service' do

spec/alarm-notifier_spec.rb

@@ -12,7 +12,7 @@ describe 'openstack-telemetry::alarm-notifier' do
     include_examples 'expect-runs-common-recipe'
 
     it 'installs the alarm-notifier package' do
-      expect(chef_run).to install_package 'ceilometer-alarm-notifier'
+      expect(chef_run).to upgrade_package 'ceilometer-alarm-notifier'
     end
 
     it 'starts and enables the alarm-notifier service' do

spec/api-rhel_spec.rb

@@ -20,7 +20,7 @@ describe 'openstack-telemetry::api' do
     end
 
     it 'installs the api package' do
-      expect(chef_run).to install_package('openstack-ceilometer-api')
+      expect(chef_run).to upgrade_package('openstack-ceilometer-api')
     end
 
     it 'starts api service' do

spec/api-suse_spec.rb

@@ -11,7 +11,7 @@ describe 'openstack-telemetry::api' do
     include_context 'telemetry-stubs'
 
     it 'installs the api package' do
-      expect(chef_run).to install_package('openstack-ceilometer-api')
+      expect(chef_run).to upgrade_package('openstack-ceilometer-api')
     end
 
     it 'starts api service' do

spec/api_spec.rb

@@ -20,7 +20,7 @@ describe 'openstack-telemetry::api' do
     end
 
     it 'installs the api package' do
-      expect(chef_run).to install_package 'ceilometer-api'
+      expect(chef_run).to upgrade_package 'ceilometer-api'
     end
 
     it 'enables and starts the api service' do

spec/collector-rhel_spec.rb

@@ -17,7 +17,7 @@ describe 'openstack-telemetry::collector' do
     end
 
     it 'installs the collector package' do
-      expect(chef_run).to install_package('openstack-ceilometer-collector')
+      expect(chef_run).to upgrade_package('openstack-ceilometer-collector')
     end
 
     it 'starts collector service' do

spec/collector-suse_spec.rb

@@ -11,7 +11,7 @@ describe 'openstack-telemetry::collector' do
     include_context 'telemetry-stubs'
 
     it 'installs the collector package' do
-      expect(chef_run).to install_package 'openstack-ceilometer-collector'
+      expect(chef_run).to upgrade_package 'openstack-ceilometer-collector'
     end
 
     it 'starts the collector service' do

spec/collector_spec.rb

@@ -12,7 +12,7 @@ describe 'openstack-telemetry::collector' do
     include_examples 'expect-runs-common-recipe'
 
     it 'installs the collector package' do
-      expect(chef_run).to install_package 'ceilometer-collector'
+      expect(chef_run).to upgrade_package 'ceilometer-collector'
     end
 
     it 'executes ceilometer dbsync' do
@@ -27,7 +27,7 @@ describe 'openstack-telemetry::collector' do
     end
 
     it 'installs python-mysqldb' do
-      expect(chef_run).to install_package('python-mysqldb')
+      expect(chef_run).to upgrade_package('python-mysqldb')
     end
 
     it 'starts and enables the collector service' do

spec/common-rhel_spec.rb

@@ -11,23 +11,23 @@ describe 'openstack-telemetry::common' do
     include_context 'telemetry-stubs'
 
     it 'installs mysql python packages by default' do
-      expect(chef_run).to install_package 'MySQL-python'
+      expect(chef_run).to upgrade_package 'MySQL-python'
     end
 
     it 'installs db2 python packages if explicitly told' do
       node.set['openstack']['db']['telemetry']['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
 
     it 'installs postgresql python packages if explicitly told' do
       node.set['openstack']['db']['telemetry']['service_type'] = 'postgresql'
-      expect(chef_run).to install_package 'python-psycopg2'
+      expect(chef_run).to upgrade_package 'python-psycopg2'
     end
 
     it 'installs the common package' do
-      expect(chef_run).to install_package 'openstack-ceilometer-common'
+      expect(chef_run).to upgrade_package 'openstack-ceilometer-common'
     end
   end
 end

spec/common-suse_spec.rb

@@ -11,16 +11,16 @@ describe 'openstack-telemetry::common' do
     include_context 'telemetry-stubs'
 
     it 'installs mysql python packages by default' do
-      expect(chef_run).to install_package 'python-mysql'
+      expect(chef_run).to upgrade_package 'python-mysql'
     end
 
     it 'installs postgresql python packages if explicitly told' do
       node.set['openstack']['db']['telemetry']['service_type'] = 'postgresql'
-      expect(chef_run).to install_package 'python-psycopg2'
+      expect(chef_run).to upgrade_package 'python-psycopg2'
     end
 
     it 'installs the common package' do
-      expect(chef_run).to install_package 'openstack-ceilometer'
+      expect(chef_run).to upgrade_package 'openstack-ceilometer'
     end
   end
 end

spec/common_spec.rb

@@ -21,16 +21,16 @@ describe 'openstack-telemetry::common' do
     end
 
     it 'installs mysql python packages by default' do
-      expect(chef_run).to install_package 'python-mysqldb'
+      expect(chef_run).to upgrade_package 'python-mysqldb'
     end
 
     it 'installs postgresql python packages if explicitly told' do
       node.set['openstack']['db']['telemetry']['service_type'] = 'postgresql'
-      expect(chef_run).to install_package 'python-psycopg2'
+      expect(chef_run).to upgrade_package 'python-psycopg2'
     end
 
     it 'installs the common package' do
-      expect(chef_run).to install_package 'ceilometer-common'
+      expect(chef_run).to upgrade_package 'ceilometer-common'
     end
 
     describe '/etc/ceilometer' do