use new python_packages attributes from -common

*_python_packages attributes are being moved to -common in order to
remove the duplication from all the cookbooks which are using them

Change-Id: Ie26ceb713ad07f28d70a6711198a229cd45f777a
Implements: blueprint move-python-db-client-attrs-to-common

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 This file is used to list changes made in each version of cookbook-openstack-image.
 
+## 9.2.0
+* python_packages database client attributes have been migrated to the -common cookbook
+
 ## 9.1.2
 ### Bug
 * Fix image upload to provide error message when type not supported

README.md

@@ -133,7 +133,6 @@ Attributes for the Image service are in the ['openstack']['image'] namespace.
 * `openstack['image']['api']['rbd']['key_name']` - The data bag item name used for the Cephx key of the rbd_store_user.
 * `openstack['image']['cron']['redirection']` - Redirection of cron output
 TODO: Add DB2 support on other platforms
-* `openstack['image']['platform']['db2_python_packages']` - Array of DB2 python packages, only available on redhat platform
 
 VMWare attributes
 -----------------
@@ -213,12 +212,14 @@ Author:: Salman Baset (<sabaset@us.ibm.com>)
 Author:: Chen Zhiwei (zhiwchen@cn.ibm.com)
 Author:: Eric Zhou (zyouzhou@cn.ibm.com)
 Author:: Jian Hua Geng (gengjh@cn.ibm.com)
+Author:: Ionut Artarisi (iartarisi@suse.cz)
 
 Copyright 2012, Rackspace US, Inc.
 Copyright 2012-2013, Opscode, Inc.
 Copyright 2012-2013, AT&T Services, Inc.
 Copyright 2013, Craig Tracey <craigtracey@gmail.com>
 Copyright 2013-2014, IBM Corp.
+Copyright 2014, SUSE Linux, GmbH.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

attributes/default.rb

@@ -128,9 +128,6 @@ when 'fedora', 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
   default['openstack']['image']['user'] = 'glance'
   default['openstack']['image']['group'] = 'glance'
   default['openstack']['image']['platform'] = {
-    'postgresql_python_packages' => ['python-psycopg2'],
-    'mysql_python_packages' => ['MySQL-python'],
-    'db2_python_packages' => ['python-ibm-db', 'python-ibm-db-sa'],
     'image_packages' => %w{openstack-glance cronie python-glanceclient},
     'image_client_packages' => ['python-glanceclient'],
     'ceph_packages' => ['python-ceph'],
@@ -144,8 +141,6 @@ when 'suse'
   default['openstack']['image']['user'] = 'openstack-glance'
   default['openstack']['image']['group'] = 'openstack-glance'
   default['openstack']['image']['platform'] = {
-    'postgresql_python_packages' => ['python-psycopg2'],
-    'mysql_python_packages' => ['python-mysql'],
     'image_packages' => ['openstack-glance', 'python-glanceclient'],
     'image_client_packages' => ['python-glanceclient'],
     'ceph_packages' => [],
@@ -159,8 +154,6 @@ when 'debian'
   default['openstack']['image']['user'] = 'glance'
   default['openstack']['image']['group'] = 'glance'
   default['openstack']['image']['platform'] = {
-    'postgresql_python_packages' => ['python-psycopg2'],
-    'mysql_python_packages' => ['python-mysqldb'],
     'image_packages' => ['glance'],
     'image_client_packages' => ['python-glanceclient'],
     'ceph_packages' => ['python-ceph'],

metadata.rb

@@ -3,7 +3,7 @@ maintainer        'Opscode, Inc.'
 license           'Apache 2.0'
 description       'Installs and configures the Glance Image Registry and Delivery Service'
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version           '9.1.2'
+version           '9.2.0'
 recipe            'openstack-image::api', 'Installs packages required for a glance api server'
 recipe            'openstack-image::client', 'Install packages required for glance client'
 recipe            'openstack-image::registry', 'Installs packages required for a glance registry server'
@@ -14,5 +14,5 @@ recipe            'openstack-image::image_upload', 'Upload image using glance im
   supports os
 end
 
-depends           'openstack-common', '~> 9.4'
+depends           'openstack-common', '~> 9.5'
 depends           'openstack-identity', '~> 9.0'

recipes/registry.rb

@@ -5,6 +5,7 @@
 #
 # Copyright 2012, Rackspace US, Inc.
 # Copyright 2013, Opscode, Inc.
+# Copyright 2014, SUSE Linux, GmbH.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -53,13 +54,11 @@ package 'curl' do
   action :upgrade
 end
 
-pkg_key = "#{node['openstack']['db']['image']['service_type']}_python_packages"
-if platform_options.key?(pkg_key)
-  platform_options[pkg_key].each do |pkg|
-    package pkg do
-      action :upgrade
-      options platform_options['package_overrides']
-    end
+db_type = node['openstack']['db']['image']['service_type']
+node['openstack']['db']['python_packages'][db_type].each do |pkg|
+  package pkg do
+    action :upgrade
+    options platform_options['package_overrides']
   end
 end
 

spec/registry_spec.rb

@@ -33,7 +33,7 @@ describe 'openstack-image::registry' do
 
     it 'honors package name and option overrides for mysql python packages' do
       node.set['openstack']['image']['platform']['package_overrides'] = '-o Dpkg::Options::=\'--force-confold\' -o Dpkg::Options::=\'--force-confdef\' --force-yes'
-      node.set['openstack']['image']['platform']['mysql_python_packages'] = ['my-mysql-py']
+      node.set['openstack']['db']['python_packages']['mysql'] = ['my-mysql-py']
 
       expect(chef_run).to upgrade_package('my-mysql-py').with(options: '-o Dpkg::Options::=\'--force-confold\' -o Dpkg::Options::=\'--force-confdef\' --force-yes')
     end
@@ -41,7 +41,7 @@ describe 'openstack-image::registry' do
     %w{db2 postgresql}.each do |service_type|
       it "upgrades #{service_type} python packages if chosen" do
         node.set['openstack']['db']['image']['service_type'] = service_type
-        node.set['openstack']['image']['platform']["#{service_type}_python_packages"] = ["my-#{service_type}-py"]
+        node.set['openstack']['db']['python_packages'][service_type] = ["my-#{service_type}-py"]
 
         expect(chef_run).to upgrade_package("my-#{service_type}-py")
       end