openstack
/
cookbook-openstack-compute
Code Issues Proposed changes

Add rabbitmq max_retries and retry_interval in nova.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.

Change-Id: Ie5ce28de16ed2b4b9c51a8b81e4accaca1466cac
Partial-bug: #1439968
This commit is contained in:
Wei Hu 2015-05-12 15:05:50 +08:00
parent a06c63ccff
commit 8d1f4228d2
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spec/nova-common_spec.rb
View File

@ -425,6 +425,7 @@ describe 'openstack-compute::nova-common' do
[/^amqp_durable_queues=false$/, /^amqp_auto_delete=false$/,
/^rabbit_userid=guest$/, /^rabbit_password=mq-pass$/,
/^rabbit_virtual_host=\/$/, /^rabbit_host=127.0.0.1$/,
/^rabbit_max_retries=0$/, /^rabbit_retry_interval=1$/,
/^rabbit_port=5672$/, /^rabbit_use_ssl=false$/].each do |line|
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', line)
end

6
templates/default/nova.conf.erb
View File

@ -850,6 +850,12 @@ kombu_ssl_version=<%= node["openstack"]["mq"]["compute"]["rabbit"]["kombu_ssl_ve
rabbit_userid=<%= node["openstack"]["mq"]["compute"]["rabbit"]["userid"] %>
rabbit_password=<%= @mq_password %>
rabbit_virtual_host=<%= node["openstack"]["mq"]["compute"]["rabbit"]["vhost"] %>
# Maximum retries with trying to connect to RabbitMQ
# (the default of 0 implies an infinite retry count)
rabbit_max_retries=<%= node["openstack"]["mq"]["compute"]["rabbit"]["rabbit_max_retries"] %>
# RabbitMQ connection retry interval
rabbit_retry_interval=<%= node["openstack"]["mq"]["compute"]["rabbit"]["rabbit_retry_interval"] %>
<% if node["openstack"]["mq"]["compute"]["rabbit"]["ha"] -%>
rabbit_hosts=<%= @rabbit_hosts %>
rabbit_ha_queues=True