Add missing AMQP options to heat.conf
Add more AMQP and QPID configuration options to the heat configuration file. This enables users to use QPID federation support and also use durable queues for rabbitmq or QPID. Change-Id: I4b944a3cbf7830d47b1398eeb347946098ce2452
This commit is contained in:
parent
4a82e1fd8e
commit
898119e187
|
@ -17,5 +17,5 @@ recipe 'openstack-orchestration::identity_registration', 'Registers H
|
|||
supports os
|
||||
end
|
||||
|
||||
depends 'openstack-common', '~> 9.0'
|
||||
depends 'openstack-common', '~> 9.4'
|
||||
depends 'openstack-identity', '~> 9.0'
|
||||
|
|
|
@ -98,6 +98,27 @@ describe 'openstack-orchestration::common' do
|
|||
expect(@chef_run).to render_file(@template.name).with_content(content)
|
||||
end
|
||||
end
|
||||
|
||||
it 'has default RPC/AMQP options set' do
|
||||
[/^rpc_thread_pool_size=64$/,
|
||||
/^rpc_conn_pool_size=30$/,
|
||||
/^rpc_response_timeout=60$/,
|
||||
/^amqp_durable_queues=false$/,
|
||||
/^amqp_auto_delete=false$/].each do |line|
|
||||
expect(@chef_run).to render_file(@template.name).with_content(line)
|
||||
end
|
||||
end
|
||||
|
||||
it 'has default qpid topology version' do
|
||||
chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
|
||||
node = chef_run.node
|
||||
node.set['openstack']['mq']['orchestration']['service_type'] = 'qpid'
|
||||
chef_run.converge 'openstack-orchestration::common'
|
||||
|
||||
expect(chef_run).to render_file(@template.name).with_content(
|
||||
/^qpid_topology_version=1$/)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
describe 'default.yaml' do
|
||||
|
|
|
@ -390,10 +390,10 @@ rpc_response_timeout=<%= node["openstack"]["orchestration"]["rpc_response_timeou
|
|||
|
||||
# Use durable queues in amqp. (boolean value)
|
||||
# Deprecated group/name - [DEFAULT]/rabbit_durable_queues
|
||||
#amqp_durable_queues=false
|
||||
amqp_durable_queues=<%= node['openstack']['mq']['orchestration']['durable_queues'] %>
|
||||
|
||||
# Auto-delete queues in amqp. (boolean value)
|
||||
#amqp_auto_delete=false
|
||||
amqp_auto_delete=<%= node['openstack']['mq']['orchestration']['auto_delete'] %>
|
||||
|
||||
|
||||
#
|
||||
|
@ -503,7 +503,7 @@ qpid_tcp_nodelay=<%= node["openstack"]["mq"]["orchestration"]["qpid"]["tcp_nodel
|
|||
# to work. Users should update to version 2 when they are
|
||||
# able to take everything down, as it requires a clean break.
|
||||
# (integer value)
|
||||
#qpid_topology_version=1
|
||||
qpid_topology_version=<%= node['openstack']['mq']['orchestration']['qpid']['topology_version'] %>
|
||||
|
||||
qpid_reconnect_timeout=<%= node["openstack"]["mq"]["orchestration"]["qpid"]["reconnect_timeout"] %>
|
||||
qpid_reconnect_limit=<%= node["openstack"]["mq"]["orchestration"]["qpid"]["reconnect_limit"] %>
|
||||
|
|
Loading…
Reference in New Issue