Wire in rabbit_retry_interval

There is no way to override it via Hiera data for a
resource-like class oslo::messaging::rabbit[Nova_Config].
So add a perameter for nova class for it.

Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
Change-Id: Ib038691b7324e613ed302059888841119c890d99

manifests/init.pp

@@ -63,6 +63,11 @@
 #   will be run through a green thread.
 #   Defaults to $::os_service_default
 #
+# [*rabbit_retry_interval*]
+#   (Optional) How frequently to retry connecting with RabbitMQ.
+#   (integer value)
+#   Defaults to $::os_service_default
+#
 # [*kombu_ssl_ca_certs*]
 #   (optional) SSL certification authority file (valid only if SSL enabled).
 #   (string value)
@@ -455,6 +460,7 @@ class nova(
   $rabbit_heartbeat_rate                  = $::os_service_default,
   $rabbit_heartbeat_in_pthread            = $::os_service_default,
   $rabbit_ha_queues                       = $::os_service_default,
+  $rabbit_retry_interval                  = $::os_service_default,
   $kombu_ssl_ca_certs                     = $::os_service_default,
   $kombu_ssl_certfile                     = $::os_service_default,
   $kombu_ssl_keyfile                      = $::os_service_default,
@@ -756,6 +762,7 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.")
     kombu_ssl_keyfile           => $kombu_ssl_keyfile,
     kombu_ssl_version           => $kombu_ssl_version,
     rabbit_ha_queues            => $rabbit_ha_queues,
+    rabbit_retry_interval       => $rabbit_retry_interval,
   }
 
   oslo::messaging::amqp { 'nova_config':

releasenotes/notes/rabbit_retry_interval-7f42d6339afafdf1.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    The new ``nova::rabbit_retry_interval`` parameter has been added.

spec/classes/nova_init_spec.rb

@@ -39,6 +39,7 @@ describe 'nova' do
         is_expected.to contain_nova_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_nova_config('oslo_messaging_rabbit/heartbeat_rate').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_nova_config('oslo_messaging_rabbit/heartbeat_in_pthread').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_nova_config('oslo_messaging_rabbit/rabbit_retry_interval').with_value('<SERVICE DEFAULT>')
       end
 
       it 'configures various things' do
@@ -260,6 +261,16 @@ describe 'nova' do
       end
     end
 
+    context 'with rabbit_retry_interval' do
+      let :params do
+        { :rabbit_retry_interval => 1 }
+      end
+
+      it 'configures rabbit' do
+        is_expected.to contain_nova_config('oslo_messaging_rabbit/rabbit_retry_interval').with_value(1)
+      end
+    end
+
     context 'with rabbit ssl enabled with kombu' do
       let :params do
         { :rabbit_use_ssl     => true,