openstack
/
cookbook-openstack-orchestration
Code Issues Proposed changes

Add db2 python packages for heat database support 

Change-Id: I62d7c4e1b5e9d3119e523521f000c82cd2569045
This commit is contained in:
hanzhf 2014-01-24 10:22:49 +08:00
parent 18299e6508
commit 78d582630c
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
attributes/default.rb
View File

@ -76,6 +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'],
'heat_common_packages' => ['openstack-heat'],
'heat_api_packages' => ['python-heatclient'],
'heat_api_service' => 'openstack-heat-api',

15
spec/common-redhat_spec.rb
View File

@ -28,6 +28,21 @@ 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
it 'installs db2 python packages if explicitly told' do
chef_run = ::ChefSpec::Runner.new ::REDHAT_OPTS
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'
expect(chef_run).not_to upgrade_package 'MySQL-python'
end
describe '/etc/heat' do