Update Prefixes.

Update the Prefixes of Ceilometer generated
RPC and Notification addresses to override
the default prefixes generated by oslo messaging.

Change-Id: Ifd5c4bca8d1fc7bbfa9f03fc09250cce9dabd954
(cherry picked from commit 8cc46892b5d9be92f806a77592776e0decae589e)

diff --git a/manifests/init.pp b/manifests/init.pp
index 1c1483fc9f71aa8f130b96b244037a2ce02af25b..a1d1024317e9767963a771cc77b2cbe36fe38cdf 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -170,6 +170,14 @@
 #   (Optional) Debug: dump AMQP frames to stdout
 #   Defaults to $::os_service_default.
 #
+# [*amqp_rpc_address_prefix*]
+#   (Optional) Address prefix for Ceilometer generated RPC addresses
+#   Defaults to $::os_service_default.
+#
+# [*amqp_notify_address_prefix*]
+#   (Optional) Address prefix for Ceilometer generated Notification addresses
+#   Defaults to $::os_service_default.
+#
 # [*amqp_ssl_ca_file*]
 #   (Optional) CA certificate PEM file to verify server certificate
 #   Defaults to $::os_service_default.
@@ -310,6 +318,8 @@ class ceilometer(
   $amqp_container_name                = $::os_service_default,
   $amqp_idle_timeout                  = $::os_service_default,
   $amqp_trace                         = $::os_service_default,
+  $amqp_rpc_address_prefix            = $::os_service_default,
+  $amqp_notify_address_prefix         = $::os_service_default,
   $amqp_ssl_ca_file                   = $::os_service_default,
   $amqp_ssl_cert_file                 = $::os_service_default,
   $amqp_ssl_key_file                  = $::os_service_default,
@@ -435,6 +445,8 @@ please use memcache_servers instead.")
     container_name         => $amqp_container_name,
     idle_timeout           => $amqp_idle_timeout,
     trace                  => $amqp_trace,
+    rpc_address_prefix     => $amqp_rpc_address_prefix,
+    notify_address_prefix  => $amqp_notify_address_prefix,
     ssl_ca_file            => $amqp_ssl_ca_file,
     ssl_cert_file          => $amqp_ssl_cert_file,
     ssl_key_file           => $amqp_ssl_key_file,