use new python_packages attributes from -common
*_python_packages attributes are being moved to -common in order to remove the duplication from all the cookbooks which are using them Change-Id: I60798fb39f6167eafd0cc483dca9bb930a236946 Implements: blueprint move-python-db-client-attrs-to-common
This commit is contained in:
Ionuț Arțăriși
parent
406f197fd8
commit
8fde9630ae
|
|
@ -1,6 +1,11 @@
|
|||
openstack-block-storage Cookbook CHANGELOG
|
||||
==============================
|
||||
This file is used to list changes made in each version of the openstack-block-storage cookbook.
|
||||
|
||||
## 9.4.0
|
||||
* python_packages database client attributes have been migrated to
|
||||
the -common cookbook
|
||||
|
||||
## 9.3.0
|
||||
### Blue print
|
||||
* Add multiple backend configuration support
|
||||
|
|
|
|||
|
|
@ -47,8 +47,6 @@ Attributes
|
|||
==========
|
||||
|
||||
* `openstack["block-storage"]["db"]["username"]` - cinder username for database
|
||||
TODO: Add DB2 support on other platforms
|
||||
* `openstack["block-storage"]["platform"]["db2_python_packages"]` - Array of DB2 python packages, only available on redhat platform
|
||||
* `openstack["block-storage"]["volume_name_template"]` - Template string to be used to generate volume names
|
||||
* `openstack["block-storage"]["snapshot_name_template"]` - Template string to be used to generate snapshot names
|
||||
* `openstack['block-storage']['api']['auth']['version']` - Select v2.0 or v3.0. Default v2.0 inherited from common cookbook. The default auth API version used to interact with identity service.
|
||||
|
|
@ -231,7 +229,7 @@ License and Author
|
|||
| **Copyright** | Copyright (c) 2012, Rackspace US, Inc. |
|
||||
| **Copyright** | Copyright (c) 2012-2013, AT&T Services, Inc. |
|
||||
| **Copyright** | Copyright (c) 2013, Opscode, Inc. |
|
||||
| **Copyright** | Copyright (c) 2013, SUSE Linux GmbH |
|
||||
| **Copyright** | Copyright (c) 2013-2014, SUSE Linux GmbH |
|
||||
| **Copyright** | Copyright (c) 2013-2014, IBM, Corp. |
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
|
|
|
|||
|
|
@ -248,9 +248,6 @@ when 'fedora', 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
|
|||
default['openstack']['block-storage']['group'] = 'cinder'
|
||||
|
||||
default['openstack']['block-storage']['platform'] = {
|
||||
'mysql_python_packages' => ['MySQL-python'],
|
||||
'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'],
|
||||
'cinder_api_service' => 'openstack-cinder-api',
|
||||
|
|
@ -271,8 +268,6 @@ when 'suse'
|
|||
default['openstack']['block-storage']['user'] = 'openstack-cinder'
|
||||
default['openstack']['block-storage']['group'] = 'openstack-cinder'
|
||||
default['openstack']['block-storage']['platform'] = {
|
||||
'mysql_python_packages' => ['python-mysql'],
|
||||
'postgresql_python_packages' => ['python-psycopg2'],
|
||||
'cinder_common_packages' => ['openstack-cinder'],
|
||||
'cinder_api_packages' => ['openstack-cinder-api'],
|
||||
'cinder_api_service' => 'openstack-cinder-api',
|
||||
|
|
@ -292,8 +287,6 @@ when 'debian'
|
|||
default['openstack']['block-storage']['user'] = 'cinder'
|
||||
default['openstack']['block-storage']['group'] = 'cinder'
|
||||
default['openstack']['block-storage']['platform'] = {
|
||||
'mysql_python_packages' => ['python-mysqldb'],
|
||||
'postgresql_python_packages' => ['python-psycopg2'],
|
||||
'cinder_common_packages' => ['cinder-common'],
|
||||
'cinder_api_packages' => ['cinder-api', 'python-cinderclient'],
|
||||
'cinder_api_service' => 'cinder-api',
|
||||
|
|
|
|||
|
|
@ -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 '9.3.0'
|
||||
version '9.4.0'
|
||||
|
||||
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'
|
||||
|
|
@ -19,7 +19,7 @@ recipe 'openstack-block-storage::volume', 'Installs the cinder-volume
|
|||
end
|
||||
|
||||
depends 'apt', '>= 2.3.8'
|
||||
depends 'openstack-common', '~> 9.4'
|
||||
depends 'openstack-common', '~> 9.5'
|
||||
depends 'openstack-identity', '~> 9.0'
|
||||
depends 'openstack-image', '~> 9.0'
|
||||
depends 'selinux', '>= 0.7.2'
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
# Copyright 2012, Rackspace US, Inc.
|
||||
# Copyright 2012-2013, AT&T Services, Inc.
|
||||
# Copyright 2013, Opscode, Inc.
|
||||
# Copyright 2013, SUSE Linux Gmbh.
|
||||
# Copyright 2013-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.
|
||||
|
|
@ -37,7 +37,7 @@ platform_options['cinder_api_packages'].each do |pkg|
|
|||
end
|
||||
|
||||
db_type = node['openstack']['db']['block-storage']['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
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
# Copyright 2012, Rackspace US, Inc.
|
||||
# Copyright 2012-2013, AT&T Services, Inc.
|
||||
# Copyright 2013, Opscode, Inc.
|
||||
# Copyright 2013, SUSE Linux Gmbh.
|
||||
# Copyright 2013-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.
|
||||
|
|
@ -34,7 +34,7 @@ platform_options['cinder_scheduler_packages'].each do |pkg|
|
|||
end
|
||||
|
||||
db_type = node['openstack']['db']['block-storage']['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
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
# Copyright 2012, Rackspace US, Inc.
|
||||
# Copyright 2012-2013, AT&T Services, Inc.
|
||||
# Copyright 2013, Opscode, Inc.
|
||||
# Copyright 2013, SUSE Linux Gmbh.
|
||||
# Copyright 2013-2014, SUSE Linux Gmbh.
|
||||
# Copyright 2013, IBM, Corp.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
|
|
@ -38,7 +38,7 @@ platform_options['cinder_volume_packages'].each do |pkg|
|
|||
end
|
||||
|
||||
db_type = node['openstack']['db']['block-storage']['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
|
||||
|
|
|
|||
Loading…
Reference in New Issue