From 821ef348df8f7871e937c71d6cda7beabdad1e42 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Sat, 28 Jan 2017 13:42:16 +0800
Subject: [PATCH] Add control_exchange and rpc_response_timeout options

Add control_exchange to configure an exchange name for message.
Add rpc_response_timeout to configure seconds time for waiting
for a response from a call.

Change-Id: I27b7d30bf422cd07b27ff248c7decd744c35427e
---
 manifests/init.pp                             | 30 ++++++++++++++-----
 ...g_default_parameters-71a3ef1234d98156.yaml |  7 +++++
 spec/classes/designate_init_spec.rb           |  2 ++
 3 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 releasenotes/notes/add_messaging_default_parameters-71a3ef1234d98156.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index 0873025a..37052a4a 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -52,6 +52,16 @@
 #     transport://user:pass@host1:port[,hostN:portN]/virtual_host
 #   Defaults to $::os_service_default
 #
+# [*rpc_response_timeout*]
+#  (Optional) Seconds to wait for a response from a call.
+#  Defaults to $::os_service_default
+#
+# [*control_exchange*]
+#   (Optional) The default exchange under which topics are scoped. May be
+#   overridden by an exchange name specified in the transport_url
+#   option.
+#   Defaults to $::os_service_default
+#
 # [*notification_transport_url*]
 #   (optional) Connection url for oslo messaging notification backend. An
 #   example rabbit url would be, rabbit://user:pass@host:port/virtual_host
@@ -154,16 +164,18 @@ class designate(
   $kombu_reconnect_delay      = $::os_service_default,
   $notification_driver        = 'messaging',
   $default_transport_url      = $::os_service_default,
+  $rpc_response_timeout       = $::os_service_default,
+  $control_exchange           = $::os_service_default,
   $notification_topics        = 'notifications',
   $purge_config               = false,
   #DEPRECATED PARAMETER
-  $rabbit_virtualhost    = undef,
-  $rabbit_host           = $::os_service_default,
-  $rabbit_port           = $::os_service_default,
-  $rabbit_hosts          = $::os_service_default,
-  $rabbit_userid         = $::os_service_default,
-  $rabbit_password       = $::os_service_default,
-  $rabbit_virtual_host   = $::os_service_default,
+  $rabbit_virtualhost         = undef,
+  $rabbit_host                = $::os_service_default,
+  $rabbit_port                = $::os_service_default,
+  $rabbit_hosts               = $::os_service_default,
+  $rabbit_userid              = $::os_service_default,
+  $rabbit_password            = $::os_service_default,
+  $rabbit_virtual_host        = $::os_service_default,
 ) inherits designate::params {
 
   if $rabbit_virtualhost {
@@ -250,7 +262,9 @@ to your desired configuration.")
     }
   }
   oslo::messaging::default { 'designate_config':
-    transport_url => $default_transport_url,
+    transport_url        => $default_transport_url,
+    rpc_response_timeout => $rpc_response_timeout,
+    control_exchange     => $control_exchange,
   }
 
   oslo::messaging::notifications { 'designate_config':
diff --git a/releasenotes/notes/add_messaging_default_parameters-71a3ef1234d98156.yaml b/releasenotes/notes/add_messaging_default_parameters-71a3ef1234d98156.yaml
new file mode 100644
index 00000000..39d5e046
--- /dev/null
+++ b/releasenotes/notes/add_messaging_default_parameters-71a3ef1234d98156.yaml
@@ -0,0 +1,7 @@
+---
+features:
+  - Add new parameter "control_exchange", the default exchange under
+    which topics are scoped. May be overridden by an exchange name
+    specified in the transport_url option.
+  - Add new parameter "rpc_response_timeout", seconds to wait for a
+    response from a call
diff --git a/spec/classes/designate_init_spec.rb b/spec/classes/designate_init_spec.rb
index 67e468fb..929fdf44 100644
--- a/spec/classes/designate_init_spec.rb
+++ b/spec/classes/designate_init_spec.rb
@@ -139,6 +139,8 @@ describe 'designate' do
       is_expected.to contain_designate_config('oslo_messaging_notifications/topics').with_value('notifications')
       is_expected.to contain_designate_config('oslo_messaging_notifications/transport_url').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_designate_config('DEFAULT/transport_url').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_designate_config('DEFAULT/rpc_response_timeout').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_designate_config('DEFAULT/control_exchange').with_value('<SERVICE DEFAULT>')
     end
 
   end