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: I309bac0e5fdf0abb110210069e731ff260679a3c
Closes-bug: 1294376
This commit is contained in:
Chen Zhiwei 2014-03-21 03:17:01 -04:00
parent a2933a98f9
commit 6b9df49443
5 changed files with 8 additions and 5 deletions

View File

@ -2,6 +2,10 @@
This file is used to list changes made in each version of cookbook-openstack-orchestration
## 8.1.1
### Bug
* Fix the DB2 ODBC driver issue
## 8.1.0
* Add client recipe

View File

@ -113,8 +113,9 @@ License and Author
| | |
|:---------------------|:---------------------------------------------------|
| **Author** | Zhao Fang Han (<hanzhf@cn.ibm.com>) |
| **Author** | Chen Zhiwei (<zhiwchen@cn.ibm.com>) |
| | |
| **Copyright** | Copyright (c) 2013, IBM Corp. |
| **Copyright** | Copyright (c) 2013-2014, IBM Corp. |
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

View File

@ -76,7 +76,7 @@ when 'fedora', 'redhat', 'centos' # :pragma-foodcritic: ~FC024 - won't fix this
default['openstack']['orchestration']['platform'] = {
'mysql_python_packages' => ['MySQL-python'],
'postgresql_python_packages' => ['python-psycopg2'],
'db2_python_packages' => ['db2-odbc', 'python-ibm-db', 'python-ibm-db-sa'],
'db2_python_packages' => ['python-ibm-db', 'python-ibm-db-sa'],
'heat_common_packages' => ['openstack-heat'],
'heat_client_packages' => ['python-heatclient'],
'heat_api_packages' => ['python-heatclient'],

View File

@ -4,7 +4,7 @@ maintainer 'IBM, Inc.'
license 'Apache 2.0'
description 'Installs and configures the Heat Service'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '8.1.0'
version '8.1.1'
recipe 'openstack-orchestration::api', 'Start and configure the Heat API service'
recipe 'openstack-orchestration::api-cfn', 'Start and configure the Heat API CloudFormation service'
recipe 'openstack-orchestration::api-cloudwatch', 'Start and configure the Heat API CloudWatch service'

View File

@ -28,7 +28,6 @@ describe 'openstack-orchestration::common' do
expect(chef_run).to upgrade_package 'python-psycopg2'
expect(chef_run).not_to upgrade_package 'MySQL-python'
expect(chef_run).not_to upgrade_package 'db2-odbc'
expect(chef_run).not_to upgrade_package 'python-ibm-db'
expect(chef_run).not_to upgrade_package 'python-ibm-db-sa'
end
@ -38,7 +37,6 @@ describe 'openstack-orchestration::common' do
node = chef_run.node
node.set['openstack']['db']['orchestration']['service_type'] = 'db2'
chef_run.converge 'openstack-orchestration::common'
expect(chef_run).to upgrade_package 'db2-odbc'
expect(chef_run).to upgrade_package 'python-ibm-db'
expect(chef_run).to upgrade_package 'python-ibm-db-sa'
expect(chef_run).not_to upgrade_package 'python-psycopg2'