From 5a664358260e9e14017929358eaab0e7d389b875 Mon Sep 17 00:00:00 2001 From: Chen Zhiwei Date: Thu, 20 Mar 2014 23:24:46 -0400 Subject: [PATCH] Fix DB2 ODBC driver installation issue There is an LWRP in db2 cookbook to install ODBC driver, so need to move this driver installation to db2 cookbook. Change-Id: I8916c11db99e0e57d36a44d48d9d0c39fd5e44a2 Closes-bug: 1294376 --- CHANGELOG.md | 4 ++++ attributes/default.rb | 2 +- metadata.rb | 2 +- spec/api-redhat_spec.rb | 2 +- spec/scheduler-redhat_spec.rb | 2 +- spec/volume-redhat_spec.rb | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c6adfd..c4ce299 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ openstack-block-storage Cookbook CHANGELOG ============================== This file is used to list changes made in each version of the openstack-block-storage cookbook. +## 8.4.1 +### Bug +* Fix the DB2 ODBC driver issue + ## 8.4.0 ### Blue print * Use the library method auth_uri_transform diff --git a/attributes/default.rb b/attributes/default.rb index 7e5e0ab..ebc7598 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -208,7 +208,7 @@ when 'fedora', 'redhat', 'centos' # :pragma-foodcritic: ~FC024 - won't fix this default['openstack']['block-storage']['platform'] = { 'mysql_python_packages' => ['MySQL-python'], - 'db2_python_packages' => ['db2-odbc', 'python-ibm-db', 'python-ibm-db-sa'], + 'db2_python_packages' => ['python-ibm-db', 'python-ibm-db-sa'], 'postgresql_python_packages' => ['python-psycopg2'], 'cinder_common_packages' => ['openstack-cinder'], 'cinder_api_packages' => ['python-cinderclient'], diff --git a/metadata.rb b/metadata.rb index 37cfb4c..f86dfb7 100644 --- a/metadata.rb +++ b/metadata.rb @@ -5,7 +5,7 @@ maintainer_email 'cookbooks@lists.tfoundry.com' license 'Apache 2.0' description 'The OpenStack Advanced Volume Management service Cinder.' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '8.4.0' +version '8.4.1' recipe 'openstack-block-storage::api', 'Installs the cinder-api, sets up the cinder database, and cinder service/user/endpoints in keystone' recipe 'openstack-block-storage::client', 'Install packages required for cinder client' diff --git a/spec/api-redhat_spec.rb b/spec/api-redhat_spec.rb index bbbb6a5..5b856df 100644 --- a/spec/api-redhat_spec.rb +++ b/spec/api-redhat_spec.rb @@ -26,7 +26,7 @@ describe 'openstack-block-storage::api' do node.set['openstack']['db']['block-storage']['service_type'] = 'db2' chef_run.converge 'openstack-block-storage::api' - ['db2-odbc', 'python-ibm-db', 'python-ibm-db-sa'].each do |pkg| + ['python-ibm-db', 'python-ibm-db-sa'].each do |pkg| expect(chef_run).to upgrade_package pkg end end diff --git a/spec/scheduler-redhat_spec.rb b/spec/scheduler-redhat_spec.rb index aa86ea5..790c2ea 100644 --- a/spec/scheduler-redhat_spec.rb +++ b/spec/scheduler-redhat_spec.rb @@ -33,7 +33,7 @@ describe 'openstack-block-storage::scheduler' do node.set['openstack']['db']['block-storage']['service_type'] = 'db2' chef_run.converge 'openstack-block-storage::scheduler' - ['db2-odbc', 'python-ibm-db', 'python-ibm-db-sa'].each do |pkg| + ['python-ibm-db', 'python-ibm-db-sa'].each do |pkg| expect(chef_run).to upgrade_package pkg end end diff --git a/spec/volume-redhat_spec.rb b/spec/volume-redhat_spec.rb index e9ad611..4b855ec 100644 --- a/spec/volume-redhat_spec.rb +++ b/spec/volume-redhat_spec.rb @@ -22,7 +22,7 @@ describe 'openstack-block-storage::volume' do node.set['openstack']['db']['block-storage']['service_type'] = 'db2' chef_run.converge 'openstack-block-storage::volume' - ['db2-odbc', 'python-ibm-db', 'python-ibm-db-sa'].each do |pkg| + ['python-ibm-db', 'python-ibm-db-sa'].each do |pkg| expect(chef_run).to upgrade_package pkg end end