From e115ab2d78b0ef8db93ddf613725acccedd9137e Mon Sep 17 00:00:00 2001 From: wenchma Date: Fri, 12 Jun 2015 16:34:56 +0800 Subject: [PATCH] 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 --- metadata.rb | 2 +- spec/ironic-common_spec.rb | 8 ++++++++ templates/default/ironic.conf.erb | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/metadata.rb b/metadata.rb index 27eec82..6092f5a 100644 --- a/metadata.rb +++ b/metadata.rb @@ -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' diff --git a/spec/ironic-common_spec.rb b/spec/ironic-common_spec.rb index 82a7055..9ec4e7a 100644 --- a/spec/ironic-common_spec.rb +++ b/spec/ironic-common_spec.rb @@ -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 diff --git a/templates/default/ironic.conf.erb b/templates/default/ironic.conf.erb index 5bf14d3..f3252cd 100644 --- a/templates/default/ironic.conf.erb +++ b/templates/default/ironic.conf.erb @@ -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 -%>