Add a single attribute for qpid protocol

This fixes the issue that there is no single attribute for qpid protocol
attribute, I defined a ['openstack']['mq']['qpid']['protocol']
attribute and it's default value is "tcp", and for the various openstack
service's qpid protocol attribute, we can override this attribute for
all openstack service, or they can override the individual qpid protocol
for the specific openstack service

Change-Id: I4cdae33f9d3f83edbf62d5019f9cb6830a02ab83
This commit is contained in:
yaohaif
2014-03-18 11:39:08 +08:00
parent f30a8dd50a
commit 0e085331e5

View File

@@ -52,6 +52,7 @@ default['openstack']['mq']['vhost'] = '/'
###################################################################
# Default qpid and rabbit values (for attribute assignment below)
###################################################################
default['openstack']['mq']['qpid']['protocol'] = 'tcp'
qpid_defaults = {
username: node['openstack']['mq']['user'],
sasl_mechanisms: '',
@@ -62,7 +63,7 @@ qpid_defaults = {
reconnect_interval_max: 0,
reconnect_interval: 0,
heartbeat: 60,
protocol: 'tcp',
protocol: node['openstack']['mq']['qpid']['protocol'],
tcp_nodelay: true,
host: node['openstack']['endpoints']['mq']['host'],
port: node['openstack']['endpoints']['mq']['port'],