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

@@ -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'

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

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 -%>
 
 

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]