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: Id3c8a262f8ce177da71201f765afaa0e2c890e0e
Implements: blueprint move-python-db-client-attrs-to-common
This commit is contained in:
Ionuț Arțăriși 2014-07-02 14:25:59 +02:00
parent c129d7d41a
commit f8078e88aa
5 changed files with 9 additions and 14 deletions

View File

@ -1,5 +1,10 @@
# CHANGELOG for cookbook-openstack-network
This file is used to list changes made in each version of cookbook-openstack-network.
## 9.1.0
* python_packages database client attributes have been migrated to
the -common cookbook
## 9.0.10
* Start the neutron server service after installed

View File

@ -61,9 +61,6 @@ Attributes
* `openstack['network']['api']['auth']['version']` - Select v2.0 or v3.0. Default v2.0. The auth API version used to interact with identity service.
* `openstack['network']["misc_neutron"]` - Array of strings to be added to neutron.conf
TODO: Add DB2 support on other platforms
* `openstack["network"]["platform"]["db2_python_packages"]` - Array of DB2 python packages, only available on redhat platform
TODO
* `openstack["network"]["service_plugins"]` - Array of Python classes to be used as `service_plugins` in neutron.conf (default: []). Set it to ['neutron.plugins.services.agent_loadbalancer.plugin.LoadBalancerPlugin'] to include the load balancer plugin.

View File

@ -953,9 +953,6 @@ when 'fedora', 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
default['openstack']['network']['platform'] = {
'user' => 'neutron',
'group' => 'neutron',
'mysql_python_packages' => ['MySQL-python'],
'db2_python_packages' => ['python-ibm-db', 'python-ibm-db-sa'],
'postgresql_python_packages' => ['python-psycopg2'],
'nova_network_packages' => ['openstack-nova-network'],
'neutron_packages' => ['openstack-neutron', 'openstack-neutron-ml2'],
'neutron_client_packages' => ['python-neutronclient'],
@ -983,8 +980,6 @@ when 'suse'
default['openstack']['network']['platform'] = {
'user' => 'openstack-neutron',
'group' => 'openstack-neutron',
'mysql_python_packages' => ['python-mysql'],
'postgresql_python_packages' => ['python-psycopg2'],
'nova_network_packages' => ['openstack-nova-network'],
'neutron_packages' => ['openstack-neutron'],
'neutron_client_packages' => ['python-neutronclient'],
@ -1014,8 +1009,6 @@ when 'debian'
default['openstack']['network']['platform'] = {
'user' => 'neutron',
'group' => 'neutron',
'mysql_python_packages' => ['python-mysqldb'],
'postgresql_python_packages' => ['python-psycopg2'],
'nova_network_packages' => ['nova-network'],
'neutron_packages' => ['neutron-common', 'python-pyparsing', 'python-cliff'],
'neutron_client_packages' => ['python-neutronclient', 'python-pyparsing'],

View File

@ -5,7 +5,7 @@ maintainer 'Jay Pipes <jaypipes@gmail.com>'
license 'Apache 2.0'
description 'Installs and configures the OpenStack Network API Service and various agents and plugins'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '9.0.10'
version '9.1.0'
recipe 'openstack-network::client', 'Install packages required for network client'
recipe 'openstack-network::server', 'Installs packages required for a OpenStack Network server'
recipe 'openstack-network::openvswitch', 'Installs packages required for OVS'
@ -17,4 +17,4 @@ recipe 'openstack-network::identity_registration', 'Registers OpenSta
end
depends 'openstack-identity', '~> 9.0'
depends 'openstack-common', '~> 9.4'
depends 'openstack-common', '~> 9.5'

View File

@ -4,7 +4,7 @@
# Recipe:: common
#
# Copyright 2013, AT&T
# Copyright 2013, SUSE Linux GmbH
# Copyright 2013-2014, SUSE Linux GmbH
# Copyright 2013-2014, IBM Corp.
#
# Licensed under the Apache License, Version 2.0 (the "License");
@ -60,7 +60,7 @@ platform_options['neutron_packages'].each do |pkg|
end
db_type = node['openstack']['db']['network']['service_type']
platform_options["#{db_type}_python_packages"].each do |pkg|
node['openstack']['db']['python_packages'][db_type].each do |pkg|
package pkg do
options platform_options['package_overrides']
action :upgrade