Merge "Fix DB2 ODBC driver installation issue"

This commit is contained in:
Jenkins 2014-03-21 17:40:18 +00:00 committed by Gerrit Code Review
commit 05e9ad01df
6 changed files with 9 additions and 5 deletions

View File

@ -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

View File

@ -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'],

View File

@ -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'

View File

@ -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

View File

@ -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

View File

@ -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