Add rabbitmq max_retries and retry_interval in neutron.conf.erb
Oslo.message using rabbit_max_retries and rabbit_retry_interval to define reconnect rabbitmq server times and interval when can not connect to rabbitmq server. Partial-bug: #1439968 Change-Id: I8e19c3343627d4e2316f91b4fb084c5b6486dd84
This commit is contained in:
parent
3d677e5190
commit
0becd08722
|
@ -17,5 +17,5 @@ recipe 'openstack-network::vpn_agent', 'Installs packages required fo
|
|||
supports os
|
||||
end
|
||||
|
||||
depends 'openstack-common', '>= 11.0.0'
|
||||
depends 'openstack-common', '>= 11.2.0'
|
||||
depends 'openstack-identity', '>= 11.0.0'
|
||||
|
|
|
@ -506,6 +506,14 @@ describe 'openstack-network' do
|
|||
expect(chef_run).to render_file(file.name).with_content(/^rabbit_virtual_host=rabbit_virtual_host_value$/)
|
||||
end
|
||||
|
||||
it 'sets the rabbit_retry_interval' do
|
||||
expect(chef_run).to render_file(file.name).with_content(/^rabbit_retry_interval=1$/)
|
||||
end
|
||||
|
||||
it 'sets the rabbit_max_retries' do
|
||||
expect(chef_run).to render_file(file.name).with_content(/^rabbit_max_retries=0$/)
|
||||
end
|
||||
|
||||
context 'rabbit ha enabled' do
|
||||
before do
|
||||
node.set['openstack']['mq']['network']['rabbit']['ha'] = true
|
||||
|
|
|
@ -180,9 +180,9 @@ rabbit_use_ssl=<%= node["openstack"]["mq"]["network"]["rabbit"]["use_ssl"] %>
|
|||
<% end %>
|
||||
# Maximum retries with trying to connect to RabbitMQ
|
||||
# (the default of 0 implies an infinite retry count)
|
||||
# rabbit_max_retries = 0
|
||||
rabbit_max_retries=<%= node["openstack"]["mq"]["network"]["rabbit"]["rabbit_max_retries"] %>
|
||||
# RabbitMQ connection retry interval
|
||||
# rabbit_retry_interval = 1
|
||||
rabbit_retry_interval=<%= node["openstack"]["mq"]["network"]["rabbit"]["rabbit_retry_interval"] %>
|
||||
<% end %>
|
||||
|
||||
<% if @mq_service_type == "qpid" %>
|
||||
|
|
Loading…
Reference in New Issue