Merge "Allow packages to be updatable"

CHANGELOG.md

@@ -1,6 +1,9 @@
 # CHANGELOG for cookbook-openstack-identity
 
 This file is used to list changes made in each version of cookbook-openstack-identity.
+## 9.1.1
+* Fix package action to allow updates
+
 ## 9.1.0
 * Add token flushing cronjob
 

metadata.rb

@@ -4,7 +4,7 @@ maintainer_email 'matt@opscode.com'
 license          'Apache 2.0'
 description      'The OpenStack Identity service Keystone.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '9.1.0'
+version          '9.1.1'
 
 recipe           'openstack-identity::client', 'Install packages required for keystone client'
 recipe           'openstack-identity::server', 'Installs and Configures Keystone Service'

recipes/server.rb

@@ -36,21 +36,22 @@ db_type = node['openstack']['db']['identity']['service_type']
 unless db_type == 'sqlite'
   platform_options["#{db_type}_python_packages"].each do |pkg|
     package pkg do
-      action :install
+      options platform_options['package_options']
+      action :upgrade
     end
   end
 end
 
 platform_options['memcache_python_packages'].each do |pkg|
   package pkg do
-    action :install
+    options platform_options['package_options']
+    action :upgrade
   end
 end
 
 platform_options['keystone_packages'].each do |pkg|
   package pkg do
     options platform_options['package_options']
-
     action :upgrade
   end
 end

spec/server-redhat_spec.rb

@@ -16,28 +16,28 @@ describe 'openstack-identity::server' do
       expect { chef_run }.to_not raise_error
     end
 
-    it 'installs mysql python packages' do
-      expect(chef_run).to install_package('MySQL-python')
+    it 'upgrades mysql python packages' 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']['identity']['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
+    it 'upgrades postgresql python packages if explicitly told' do
       node.set['openstack']['db']['identity']['service_type'] = 'postgresql'
-      expect(chef_run).to install_package('python-psycopg2')
+      expect(chef_run).to upgrade_package('python-psycopg2')
     end
 
-    it 'installs memcache python packages' do
-      expect(chef_run).to install_package('python-memcached')
+    it 'upgrades memcache python packages' do
+      expect(chef_run).to upgrade_package('python-memcached')
     end
 
-    it 'installs keystone packages' do
+    it 'upgrades keystone packages' do
       expect(chef_run).to upgrade_package('openstack-keystone')
     end
 

spec/server-suse_spec.rb

@@ -16,20 +16,20 @@ describe 'openstack-identity::server' do
       expect { chef_run }.to_not raise_error
     end
 
-    it 'installs mysql python packages' do
-      expect(chef_run).to install_package('python-mysql')
+    it 'upgrades mysql python packages' do
+      expect(chef_run).to upgrade_package('python-mysql')
     end
 
-    it 'installs postgresql python packages if explicitly told' do
+    it 'upgrades postgresql python packages if explicitly told' do
       node.set['openstack']['db']['identity']['service_type'] = 'postgresql'
-      expect(chef_run).to install_package('python-psycopg2')
+      expect(chef_run).to upgrade_package('python-psycopg2')
     end
 
-    it 'installs memcache python packages' do
-      expect(chef_run).to install_package('python-python-memcached')
+    it 'upgrades memcache python packages' do
+      expect(chef_run).to upgrade_package('python-python-memcached')
     end
 
-    it 'installs keystone packages' do
+    it 'upgrades keystone packages' do
       expect(chef_run).to upgrade_package('openstack-keystone')
     end
 

spec/server_spec.rb

@@ -42,20 +42,20 @@ describe 'openstack-identity::server' do
       expect { chef_run }.to_not raise_error
     end
 
-    it 'installs mysql python packages' do
-      expect(chef_run).to install_package('python-mysqldb')
+    it 'upgrades mysql python packages' do
+      expect(chef_run).to upgrade_package('python-mysqldb')
     end
 
-    it 'installs postgresql python packages if explicitly told' do
+    it 'upgrades postgresql python packages if explicitly told' do
       node.set['openstack']['db']['identity']['service_type'] = 'postgresql'
-      expect(chef_run).to install_package('python-psycopg2')
+      expect(chef_run).to upgrade_package('python-psycopg2')
     end
 
-    it 'installs memcache python packages' do
-      expect(chef_run).to install_package('python-memcache')
+    it 'upgrades memcache python packages' do
+      expect(chef_run).to upgrade_package('python-memcache')
     end
 
-    it 'installs keystone packages' do
+    it 'upgrades keystone packages' do
       expect(chef_run).to upgrade_package('keystone')
     end