openstack
/
cookbook-openstack-block-storage
Code Issues Proposed changes

Generalize control_exchange attribute 

The control exchange attribute was placed under 'rabbit' but it is
actually a property for 'qpid' too so moved it out at the same level as
the related 'rpc_backend'. Also moved it closer to rpc_backend in the
template.

Documented both attributes.

Change-Id: Iade5a48abbb865cf3a21c9beb8e6cc7783517fb0
This commit is contained in:
Luis A. Garcia 2014-03-21 00:00:09 +00:00
parent 653b93326d
commit d6e50c9952
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -5,6 +5,7 @@ This file is used to list changes made in each version of the openstack-block-st
## 8.4.1
### Bug
* Fix the DB2 ODBC driver issue
* Move control_exchange outside of 'rabbit'
## 8.4.0
### Blue print

2
README.md
View File

@ -119,6 +119,8 @@ Cinder attributes
* `openstack["block-storage"]["netapp"]["netapp_server_password"]` - Password for user above
* `openstack["block-storage"]["nfs"]["shares_config"]` - File containing line by line entries of server:export
* `openstack["block-storage"]["nfs"]["mount_point_base"]` - Directory to mount NFS exported shares
* `openstack["block-storage"]["control_exchange"]` - The AMQP exchange to connect to if using RabbitMQ or Qpid, defaults to cinder
* `openstack["block-storage"]["rpc_backend"]` - The messaging module to use, defaults to kombu.
* `openstack["block-storage"]["rpc_thread_pool_size"]` - Size of RPC thread pool
* `openstack["block-storage"]["rpc_conn_pool_size"]` - Size of RPC connection pool
* `openstack["block-storage"]["rpc_response_timeout"]` - Seconds to wait for a response from call or multicall

3
attributes/default.rb
View File

@ -39,8 +39,9 @@ default['openstack']['block-storage']['debug'] = 'False'
# Default lock_path
default['openstack']['block-storage']['lock_path'] = '/var/lock/cinder'
# Default notification_driver
# Default notification_driver and control exchange
default['openstack']['block-storage']['notification_driver'] = 'cinder.openstack.common.notifier.rpc_notifier'
default['openstack']['block-storage']['control_exchange'] = 'cinder'
# Availability zone/region for the OpenStack Block-Storage service
default['openstack']['block-storage']['region'] = node['openstack']['region']
default['openstack']['block-storage']['scheduler_role'] = 'os-block-storage-scheduler'

12
templates/default/cinder.conf.erb
View File

@ -172,13 +172,6 @@ auth_strategy=keystone
#### (StrOpt) The strategy to use for auth. Supports noauth, keystone, and
#### deprecated.
<% if node["openstack"]["mq"]["block-storage"]["rabbit"]["control_exchange"] %>
control_exchange=<%=node["openstack"]["mq"]["block-storage"]["rabbit"]["control_exchange"]%>
<% end %>
# control_exchange=cinder
#### (StrOpt) AMQP exchange to connect to if using RabbitMQ or Qpid
######## defined in cinder.policy ########
# policy_file=policy.json
@ -331,8 +324,11 @@ snapshot_name_template=<%= node["openstack"]["block-storage"]["snapshot_name_tem
######## defined in cinder.openstack.common.rpc ########
#### (StrOpt) The messaging module to use, defaults to kombu.
rpc_backend=<%= node["openstack"]["block_storage"]["rpc_backend"] %>
#### (StrOpt) The messaging module to use, defaults to kombu.
control_exchange=<%=node['openstack']['block-storage']['control_exchange']%>
#### (StrOpt) AMQP exchange to connect to if using RabbitMQ or Qpid
rpc_thread_pool_size=<%= node["openstack"]["block-storage"]["rpc_thread_pool_size"] %>