From e1a1a5cbedad165b4942d77f48c2c55605c70adb Mon Sep 17 00:00:00 2001
From: Andrew Smith <ansmith@redhat.com>
Date: Wed, 25 Jan 2017 20:08:42 -0500
Subject: Use rpc and notify transport_url for oslo_messaging backends

This commit adds the transport_url for specifying the oslo.messaging
rpc and notify transport schemes. The rpc or notification backend
can be one of rabbit, amqp, zmq, etc. Oslo.messaging is deprecating
the host, port and auth configuration options. All drivers will
get the options via the transport_url.

This patch:
* Adds transport_url to base services
* Updates the corresponding specs
* Adds to default hierdata

Depends-On: I1cf93d2caebfa1f7373c16754a2ad9bd15eb1a40

Change-Id: Iea5607dbb3ee6b1dd50acc1395de52dc920aa915
---
 manifests/profile/base/manila.pp | 80 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 70 insertions(+), 10 deletions(-)

(limited to 'manifests/profile/base/manila.pp')

diff --git a/manifests/profile/base/manila.pp b/manifests/profile/base/manila.pp
index f021f64..87179ab 100644
--- a/manifests/profile/base/manila.pp
+++ b/manifests/profile/base/manila.pp
@@ -26,19 +26,64 @@
 #   (Optional) The current step of the deployment
 #   Defaults to hiera('step')
 #
-# [*rabbit_hosts*]
-#   list of the rabbbit host fqdns
+# [*oslomsg_rpc_proto*]
+#   Protocol driver for the oslo messaging rpc service
+#   Defaults to hiera('messaging_rpc_service_name', rabbit)
+#
+# [*oslomsg_rpc_hosts*]
+#   list of the oslo messaging rpc host fqdns
 #   Defaults to hiera('rabbitmq_node_names')
 #
-# [*rabbit_port*]
-#   IP port for rabbitmq service
+# [*oslomsg_rpc_port*]
+#   IP port for oslo messaging rpc service
 #   Defaults to hiera('manila::rabbit_port', 5672)
+#
+# [*oslomsg_rpc_username*]
+#   Username for oslo messaging rpc service
+#   Defaults to hiera('manila::rabbit_userid', 'guest')
+#
+# [*oslomsg_rpc_password*]
+#   Password for oslo messaging rpc service
+#   Defaults to hiera('manila::rabbit_password')
+#
+# [*oslomsg_notify_proto*]
+#   Protocol driver for the oslo messaging notify service
+#   Defaults to hiera('messaging_notify_service_name', rabbit)
+#
+# [*oslomsg_notify_hosts*]
+#   list of the oslo messaging notify host fqdns
+#   Defaults to hiera('rabbitmq_node_names')
+#
+# [*oslomsg_notify_port*]
+#   IP port for oslo messaging notify service
+#   Defaults to hiera('manila::rabbit_port', 5672)
+#
+# [*oslomsg_notify_username*]
+#   Username for oslo messaging notify service
+#   Defaults to hiera('manila::rabbit_userid', 'guest')
+#
+# [*oslomsg_notify_password*]
+#   Password for oslo messaging notify service
+#   Defaults to hiera('manila::rabbit_password')
+#
+# [*oslomsg_use_ssl*]
+#   Enable ssl oslo messaging services
+#   Defaults to hiera('manila::rabbit_use_ssl', '0')
 
 class tripleo::profile::base::manila (
-  $bootstrap_node = hiera('bootstrap_nodeid', undef),
-  $step           = hiera('step'),
-  $rabbit_hosts   = hiera('rabbitmq_node_names', undef),
-  $rabbit_port    = hiera('manila::rabbit_port', 5672),
+  $bootstrap_node          = hiera('bootstrap_nodeid', undef),
+  $step                    = hiera('step'),
+  $oslomsg_rpc_proto       = hiera('messaging_rpc_service_name', 'rabbit'),
+  $oslomsg_rpc_hosts       = any2array(hiera('rabbitmq_node_names', undef)),
+  $oslomsg_rpc_password    = hiera('manila::rabbit_password'),
+  $oslomsg_rpc_port        = hiera('manila::rabbit_port', '5672'),
+  $oslomsg_rpc_username    = hiera('manila::rabbit_userid', 'guest'),
+  $oslomsg_notify_proto    = hiera('messaging_notify_service_name', 'rabbit'),
+  $oslomsg_notify_hosts    = any2array(hiera('rabbitmq_node_names', undef)),
+  $oslomsg_notify_password = hiera('manila::rabbit_password'),
+  $oslomsg_notify_port     = hiera('manila::rabbit_port', '5672'),
+  $oslomsg_notify_username = hiera('manila::rabbit_userid', 'guest'),
+  $oslomsg_use_ssl         = hiera('manila::rabbit_use_ssl', '0'),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
@@ -47,9 +92,24 @@ class tripleo::profile::base::manila (
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
-    $rabbit_endpoints = suffix(any2array($rabbit_hosts), ":${rabbit_port}")
+    $oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
     class { '::manila' :
-      rabbit_hosts => $rabbit_endpoints,
+      default_transport_url      => os_transport_url({
+        'transport' => $oslomsg_rpc_proto,
+        'hosts'     => $oslomsg_rpc_hosts,
+        'port'      => sprintf('%s', $oslomsg_rpc_port),
+        'username'  => $oslomsg_rpc_username,
+        'password'  => $oslomsg_rpc_password,
+        'ssl'       => $oslomsg_use_ssl_real,
+      }),
+      notification_transport_url => os_transport_url({
+        'transport' => $oslomsg_notify_proto,
+        'hosts'     => $oslomsg_notify_hosts,
+        'port'      => sprintf('%s', $oslomsg_notify_port),
+        'username'  => $oslomsg_notify_username,
+        'password'  => $oslomsg_notify_password,
+        'ssl'       => $oslomsg_use_ssl_real,
+      }),
     }
     include ::manila::config
   }
-- 
cgit 1.2.3-korg