openstack
/
cookbook-openstack-bare-metal
Code Issues Proposed changes

Add rabbitmq max_retries and retry_interval in ironic conf 

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: I43c682784d5721a09546937b9e587d9e67478883
Partial-Bug: #1439968
This commit is contained in:
wenchma 2015-06-12 16:34:56 +08:00 committed by Ma Wen Cheng
parent 6ca26b654b
commit e115ab2d78
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
metadata.rb
View File

@ -12,5 +12,5 @@ recipe 'openstack-bare-metal::default', 'Temp workaround to create ironic db wit
recipe 'openstack-bare-metal::identity_registration', 'Registers ironic service/user/endpoints in keystone'
recipe 'openstack-bare-metal::ironic-common', 'Defines the common pieces of repeated code from the other recipes'
depends 'openstack-common', '>= 11.0.0'
depends 'openstack-common', '>= 11.2.0'
depends 'openstack-identity', '>= 11.0.0'

8
spec/ironic-common_spec.rb
View File

@ -246,6 +246,14 @@ describe 'openstack-bare-metal::ironic-common' do
node.set['openstack']['mq']['bare-metal']['rabbit']['vhost'] = 'vhost_value'
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_virtual_host=vhost_value$/)
end
it 'has the default rabbit_retry_interval set' do
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_retry_interval=1$/)
end
it 'has the default rabbit_max_retries set' do
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_max_retries=0$/)
end
end
end

4
templates/default/ironic.conf.erb
View File

@ -1187,7 +1187,7 @@ rabbit_use_ssl=<%= node['openstack']['mq']['bare-metal']['rabbit']['use_ssl'] %>
# How frequently to retry connecting with RabbitMQ. (integer
# value)
#rabbit_retry_interval=1
rabbit_retry_interval=<%= node['openstack']['mq']['bare-metal']['rabbit']['rabbit_retry_interval'] %>
# How long to backoff for between retries when connecting to
# RabbitMQ. (integer value)
@ -1195,7 +1195,7 @@ rabbit_use_ssl=<%= node['openstack']['mq']['bare-metal']['rabbit']['use_ssl'] %>
# Maximum number of RabbitMQ connection retries. Default is 0
# (infinite retry count). (integer value)
#rabbit_max_retries=0
rabbit_max_retries=<%= node['openstack']['mq']['bare-metal']['rabbit']['rabbit_max_retries'] %>
<% end -%>