From ff2d6f597dfc46a87b95dc6eeb8cd7c9fdcc7e2c Mon Sep 17 00:00:00 2001
From: wenchma <wenchma@cn.ibm.com>
Date: Fri, 12 Jun 2015 15:14:47 +0800
Subject: [PATCH] Add rabbitmq max_retries and retry_interval attributes in
 ceilometer 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: I1fd9d4840a55453667eb2ed4c03e4c3cb72442b9
Closes-bug: #1439968
---
 metadata.rb                           | 2 +-
 spec/common_spec.rb                   | 4 +++-
 templates/default/ceilometer.conf.erb | 7 +++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/metadata.rb b/metadata.rb
index 50de4e4..b83a620 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -21,6 +21,6 @@ recipe 'openstack-telemetry::identity_registration', 'Registers the endpoints, t
   supports os
 end
 
-depends 'openstack-common', '>= 11.0.0'
+depends 'openstack-common', '>= 11.2.0'
 depends 'openstack-identity', '>= 11.0.0'
 depends 'openstack-compute', '>= 11.0.0'
diff --git a/spec/common_spec.rb b/spec/common_spec.rb
index d15d0b3..bc8a08b 100644
--- a/spec/common_spec.rb
+++ b/spec/common_spec.rb
@@ -111,7 +111,9 @@ describe 'openstack-telemetry::common' do
               /^rabbit_port = 5672$/,
               /^rabbit_host = 127.0.0.1$/,
               /^rabbit_virtual_host = \/$/,
-              /^rabbit_use_ssl = false$/
+              /^rabbit_use_ssl = false$/,
+              /^rabbit_max_retries = 0$/,
+              /^rabbit_retry_interval = 1$/
             ].each do |line|
               expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', line)
             end
diff --git a/templates/default/ceilometer.conf.erb b/templates/default/ceilometer.conf.erb
index 8502cbf..9180eab 100644
--- a/templates/default/ceilometer.conf.erb
+++ b/templates/default/ceilometer.conf.erb
@@ -127,6 +127,13 @@ rabbit_host = <%= node["openstack"]["mq"]["telemetry"]["rabbit"]["host"] %>
 rabbit_virtual_host = <%= node["openstack"]["mq"]["telemetry"]["rabbit"]["vhost"] %>
 rabbit_use_ssl = <%= node["openstack"]["mq"]["telemetry"]["rabbit"]["use_ssl"] %>
 rpc_backend = ceilometer.openstack.common.rpc.impl_kombu
+
+# Maximum retries with trying to connect to RabbitMQ
+# (the default of 0 implies an infinite retry count)
+rabbit_max_retries = <%= node["openstack"]["mq"]["telemetry"]["rabbit"]["rabbit_max_retries"] %>
+
+# RabbitMQ connection retry interval
+rabbit_retry_interval = <%= node["openstack"]["mq"]["telemetry"]["rabbit"]["rabbit_retry_interval"] %>
 <% end %>
 
 [publisher_rpc]