diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ec8cf3..a8a6d5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # CHANGELOG for cookbook-openstack-orchestration This file is used to list changes made in each version of cookbook-openstack-orchestration + +## 9.2.0 +* python_packages database client attributes have been migrated to +the -common cookbook + ## 9.1.6 * Allow region_name_for_services to be overridden diff --git a/README.md b/README.md index f1ac400..df51203 100644 --- a/README.md +++ b/README.md @@ -138,8 +138,10 @@ License and Author |:---------------------|:---------------------------------------------------| | **Author** | Zhao Fang Han () | | **Author** | Chen Zhiwei () | +| **Author** | Ionuț Arțăriși (iartarisi@suse.cz) | | | | | **Copyright** | Copyright (c) 2013-2014, IBM Corp. | +| **Copyright** | Copyright (c) 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. diff --git a/attributes/default.rb b/attributes/default.rb index 263f937..e39d42a 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -81,9 +81,6 @@ when 'fedora', 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this default['openstack']['orchestration']['user'] = 'heat' default['openstack']['orchestration']['group'] = 'heat' default['openstack']['orchestration']['platform'] = { - 'mysql_python_packages' => ['MySQL-python'], - 'postgresql_python_packages' => ['python-psycopg2'], - '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'], @@ -101,8 +98,6 @@ when 'debian' default['openstack']['orchestration']['user'] = 'heat' default['openstack']['orchestration']['group'] = 'heat' default['openstack']['orchestration']['platform'] = { - 'mysql_python_packages' => ['python-mysqldb'], - 'postgresql_python_packages' => ['python-psycopg2'], 'heat_common_packages' => ['heat-common'], 'heat_client_packages' => ['python-heatclient'], 'heat_api_packages' => ['heat-api', 'python-heatclient'], diff --git a/metadata.rb b/metadata.rb index 6799400..136e01a 100644 --- a/metadata.rb +++ b/metadata.rb @@ -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 '9.1.6' +version '9.2' 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' @@ -17,5 +17,5 @@ recipe 'openstack-orchestration::identity_registration', 'Registers H supports os end -depends 'openstack-common', '~> 9.4' +depends 'openstack-common', '~> 9.5' depends 'openstack-identity', '~> 9.0' diff --git a/recipes/common.rb b/recipes/common.rb index c1a9be9..dc3787c 100644 --- a/recipes/common.rb +++ b/recipes/common.rb @@ -4,6 +4,7 @@ # Recipe:: engine # # Copyright 2013, 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. @@ -42,7 +43,7 @@ platform_options['heat_common_packages'].each do |pkg| end db_type = node['openstack']['db']['orchestration']['service_type'] -platform_options["#{db_type}_python_packages"].each do |pkg| +node['openstack']['db']['python_packages'][db_type].each do |pkg| package pkg do action :upgrade end