Merge "Add oslo_messaging_rabbit/amqp_durable_queues option"

manifests/init.pp

@@ -571,6 +571,10 @@
 #   in the keystone config.
 #   Defaults to false.
 #
+# [*amqp_durable_queues*]
+#   (optional) Whether to use durable queues in AMQP.
+#   Defaults to $::os_service_default.
+#
 # === DEPRECATED PARAMETERS
 #
 # [*enable_pki_setup*]
@@ -740,6 +744,7 @@ class keystone(
   $manage_policyrcd                     = false,
   $enable_proxy_headers_parsing         = $::os_service_default,
   $purge_config                         = false,
+  $amqp_durable_queues                  = $::os_service_default,
   # DEPRECATED PARAMETERS
   $admin_workers                        = $::os_workers,
   $public_workers                       = $::os_workers,
@@ -1035,6 +1040,7 @@ Fernet or UUID tokens are recommended.")
     rabbit_ha_queues            => $rabbit_ha_queues,
     heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold,
     heartbeat_rate              => $rabbit_heartbeat_rate,
+    amqp_durable_queues         => $amqp_durable_queues,
   }
 
   keystone_config {

releasenotes/notes/add_amqp_durable_queues-12ed69721e01b67c.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - Add new parameter "amqp_durable_queues", to indicate whether to use
+    durable queues in AMQP

spec/classes/keystone_init_spec.rb

@@ -60,6 +60,7 @@ describe 'keystone' do
       'notification_transport_url'         => '<SERVICE DEFAULT>',
       'rabbit_heartbeat_timeout_threshold' => '<SERVICE DEFAULT>',
       'rabbit_heartbeat_rate'              => '<SERVICE DEFAULT>',
+      'amqp_durable_queues'                => '<SERVICE DEFAULT>',
       'admin_workers'                      => 20,
       'public_workers'                     => 20,
       'member_role_id'                     => '<SERVICE DEFAULT>',
@@ -111,6 +112,7 @@ describe 'keystone' do
       'rabbit_heartbeat_timeout_threshold' => '60',
       'rabbit_heartbeat_rate'              => '10',
       'rabbit_ha_queues'                   => true,
+      'amqp_durable_queues'                => true,
       'default_domain'                     => 'other_domain',
       'member_role_id'                     => '123456789',
       'member_role_name'                   => 'othermember',
@@ -231,6 +233,7 @@ describe 'keystone' do
     it 'should contain correct rabbit heartbeat configuration' do
       is_expected.to contain_keystone_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value(param_hash['rabbit_heartbeat_timeout_threshold'])
       is_expected.to contain_keystone_config('oslo_messaging_rabbit/heartbeat_rate').with_value(param_hash['rabbit_heartbeat_rate'])
+      is_expected.to contain_keystone_config('oslo_messaging_rabbit/amqp_durable_queues').with_value(param_hash['amqp_durable_queues'])
     end
 
     it 'should remove max_token_size param by default' do