From 895a8eaa87561e6801b477a7db25fd92417f1fff Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Sat, 28 Jan 2017 12:59:08 +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: I0d54accfea048fa394dac18e141a620d127579cf
---
 manifests/init.pp                                | 16 +++++++++++++++-
 ...ging_default_parameters-813a34e99f22d134.yaml |  7 +++++++
 spec/classes/ceilometer_init_spec.rb             | 12 +++++++++++-
 3 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/add_messaging_default_parameters-813a34e99f22d134.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index ea1fb69..3c3b2f4 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -57,6 +57,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) A URL representing the messaging driver to use for notifications
 #   and its full configuration. Transport URLs take the form:
@@ -243,6 +253,8 @@ class ceilometer(
   $use_stderr                         = undef,
   $log_facility                       = undef,
   $default_transport_url              = $::os_service_default,
+  $rpc_response_timeout               = $::os_service_default,
+  $control_exchange                   = $::os_service_default,
   $notification_transport_url         = $::os_service_default,
   $rpc_backend                        = $::os_service_default,
   $rabbit_ha_queues                   = $::os_service_default,
@@ -398,7 +410,9 @@ deprecated. Please use ceilometer::default_transport_url instead.")
   }
 
   oslo::messaging::default { 'ceilometer_config':
-    transport_url => $default_transport_url,
+    transport_url        => $default_transport_url,
+    rpc_response_timeout => $rpc_response_timeout,
+    control_exchange     => $control_exchange,
   }
 
   oslo::cache { 'ceilometer_config':
diff --git a/releasenotes/notes/add_messaging_default_parameters-813a34e99f22d134.yaml b/releasenotes/notes/add_messaging_default_parameters-813a34e99f22d134.yaml
new file mode 100644
index 0000000..39d5e04
--- /dev/null
+++ b/releasenotes/notes/add_messaging_default_parameters-813a34e99f22d134.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/ceilometer_init_spec.rb b/spec/classes/ceilometer_init_spec.rb
index caf70ea..2f28d6f 100644
--- a/spec/classes/ceilometer_init_spec.rb
+++ b/spec/classes/ceilometer_init_spec.rb
@@ -124,6 +124,8 @@ describe 'ceilometer' do
 
     it 'configures default transport_url' do
       is_expected.to contain_ceilometer_config('DEFAULT/transport_url').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_ceilometer_config('DEFAULT/rpc_response_timeout').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_ceilometer_config('DEFAULT/control_exchange').with_value('<SERVICE DEFAULT>')
     end
 
     it 'configures notifications' do
@@ -137,10 +139,18 @@ describe 'ceilometer' do
     end
 
     context 'with overriden transport_url parameter' do
-      before { params.merge!( :default_transport_url => 'rabbit://rabbit_user:password@localhost:5673' ) }
+      before {
+        params.merge!(
+          :default_transport_url => 'rabbit://rabbit_user:password@localhost:5673',
+          :rpc_response_timeout  => '120',
+          :control_exchange      => 'ceilometer',
+        )
+      }
 
       it 'configures transport_url' do
         is_expected.to contain_ceilometer_config('DEFAULT/transport_url').with_value('rabbit://rabbit_user:password@localhost:5673')
+        is_expected.to contain_ceilometer_config('DEFAULT/rpc_response_timeout').with_value('120')
+        is_expected.to contain_ceilometer_config('DEFAULT/control_exchange').with_value('ceilometer')
       end
     end
 
-- 
2.45.2