From c46945c8e98244f8c94b5d08dfdfbfb95f5b6c3d Mon Sep 17 00:00:00 2001
From: wenchma <wenchma@cn.ibm.com>
Date: Fri, 12 Jun 2015 14:35:41 +0800
Subject: [PATCH] Add rabbitmq max_retries and retry_interval attributes in
 glance 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: Id205952829678a83b0ccd8e415c64cf1283e0e08
Closes-bug: #1439968
---
 metadata.rb                                | 2 +-
 spec/spec_helper.rb                        | 8 ++++++++
 templates/default/glance-api.conf.erb      | 7 +++++++
 templates/default/glance-registry.conf.erb | 7 +++++++
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/metadata.rb b/metadata.rb
index 067555a..ca2db9a 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -15,6 +15,6 @@ recipe 'openstack-image::image_upload', 'Upload image using glance image-create
   supports os
 end
 
-depends 'openstack-common', '>= 11.0.0'
+depends 'openstack-common', '>= 11.2.0'
 depends 'openstack-identity', '>= 11.0.0'
 depends 'ceph', '~> 0.8.0'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index d3bafbb..1cf8400 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -313,6 +313,14 @@ shared_examples 'messaging' do
 
         expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^kombu_ssl_version=TLSv1.2$/)
       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
 
     context 'qpid' do
diff --git a/templates/default/glance-api.conf.erb b/templates/default/glance-api.conf.erb
index 51d4bad..772a922 100644
--- a/templates/default/glance-api.conf.erb
+++ b/templates/default/glance-api.conf.erb
@@ -815,6 +815,13 @@ rabbit_userid = <%= node["openstack"]["mq"]["image"]["rabbit"]["userid"] %>
 rabbit_password = <%= @mq_password %>
 rabbit_virtual_host = <%= node["openstack"]["mq"]["image"]["rabbit"]["vhost"] %>
 notification_topics = <%= node["openstack"]["mq"]["image"]["rabbit"]["notification_topic"] %>
+
+# Maximum retries with trying to connect to RabbitMQ
+# (the default of 0 implies an infinite retry count)
+rabbit_max_retries = <%= node["openstack"]["mq"]["image"]["rabbit"]["rabbit_max_retries"] %>
+
+# RabbitMQ connection retry interval
+rabbit_retry_interval = <%= node["openstack"]["mq"]["image"]["rabbit"]["rabbit_retry_interval"] %>
 <% end -%>
 
 
diff --git a/templates/default/glance-registry.conf.erb b/templates/default/glance-registry.conf.erb
index 7e4208c..1ba5862 100644
--- a/templates/default/glance-registry.conf.erb
+++ b/templates/default/glance-registry.conf.erb
@@ -348,6 +348,13 @@ rabbit_userid = <%= node["openstack"]["mq"]["image"]["rabbit"]["userid"] %>
 rabbit_password = <%= @mq_password %>
 rabbit_virtual_host = <%= node["openstack"]["mq"]["image"]["rabbit"]["vhost"] %>
 notification_topics = <%= node["openstack"]["mq"]["image"]["rabbit"]["notification_topic"] %>
+
+# Maximum retries with trying to connect to RabbitMQ
+# (the default of 0 implies an infinite retry count)
+rabbit_max_retries = <%= node["openstack"]["mq"]["image"]["rabbit"]["rabbit_max_retries"] %>
+
+# RabbitMQ connection retry interval
+rabbit_retry_interval = <%= node["openstack"]["mq"]["image"]["rabbit"]["rabbit_retry_interval"] %>
 <% end -%>
 
 [paste_deploy]