Merge "Use rpc and notify transport_url for oslo_messaging backends"

16 files changed, 913 insertions, 251 deletions

diff --git a/manifests/profile/base/aodh.pp b/manifests/profile/base/aodh.pp
index 6e70b50..d6561a2 100644
--- a/manifests/profile/base/aodh.pp
+++ b/manifests/profile/base/aodh.pp
@@ -27,19 +27,64 @@
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
 #   Defaults to hiera('bootstrap_nodeid')
 #
-# [*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('aodh::rabbit_port', 5672)
+#
+# [*oslomsg_rpc_username*]
+#   Username for oslo messaging rpc service
+#   Defaults to hiera('aodh::rabbit_userid', 'guest')
+#
+# [*oslomsg_rpc_password*]
+#   Password for oslo messaging rpc service
+#   Defaults to hiera('aodh::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('aodh::rabbit_port', 5672)
+#
+# [*oslomsg_notify_username*]
+#   Username for oslo messaging notify service
+#   Defaults to hiera('aodh::rabbit_userid', 'guest')
+#
+# [*oslomsg_notify_password*]
+#   Password for oslo messaging notify service
+#   Defaults to hiera('aodh::rabbit_password')
+#
+# [*oslomsg_use_ssl*]
+#   Enable ssl oslo messaging services
+#   Defaults to hiera('aodh::rabbit_use_ssl', '0')
 
 class tripleo::profile::base::aodh (
-  $step           = hiera('step'),
-  $bootstrap_node = hiera('bootstrap_nodeid', undef),
-  $rabbit_hosts   = hiera('rabbitmq_node_names', undef),
-  $rabbit_port    = hiera('aodh::rabbit_port', 5672),
+  $step                    = hiera('step'),
+  $bootstrap_node          = hiera('bootstrap_nodeid', undef),
+  $oslomsg_rpc_proto       = hiera('messaging_rpc_service_name', 'rabbit'),
+  $oslomsg_rpc_hosts       = any2array(hiera('rabbitmq_node_names', undef)),
+  $oslomsg_rpc_password    = hiera('aodh::rabbit_password'),
+  $oslomsg_rpc_port        = hiera('aodh::rabbit_port', '5672'),
+  $oslomsg_rpc_username    = hiera('aodh::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('aodh::rabbit_password'),
+  $oslomsg_notify_port     = hiera('aodh::rabbit_port', '5672'),
+  $oslomsg_notify_username = hiera('aodh::rabbit_userid', 'guest'),
+  $oslomsg_use_ssl         = hiera('aodh::rabbit_use_ssl', '0'),
 ) {
 
   if $::hostname == downcase($bootstrap_node) {
@@ -49,9 +94,24 @@ class tripleo::profile::base::aodh (
   }
 
   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 { '::aodh' :
-      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 ::aodh::auth
     include ::aodh::config
diff --git a/manifests/profile/base/barbican/api.pp b/manifests/profile/base/barbican/api.pp
index b464317..64c2b62 100644
--- a/manifests/profile/base/barbican/api.pp
+++ b/manifests/profile/base/barbican/api.pp
@@ -56,6 +56,50 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
+# [*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')
+#
+# [*oslomsg_rpc_port*]
+#   IP port for oslo messaging rpc service
+#   Defaults to hiera('barbican::api::rabbit_port', 5672)
+#
+# [*oslomsg_rpc_username*]
+#   Username for oslo messaging rpc service
+#   Defaults to hiera('barbican::api::rabbit_userid', 'guest')
+#
+# [*oslomsg_rpc_password*]
+#   Password for oslo messaging rpc service
+#   Defaults to hiera('barbican::api::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('barbican::api::rabbit_port', 5672)
+#
+# [*oslomsg_notify_username*]
+#   Username for oslo messaging notify service
+#   Defaults to hiera('barbican::api::rabbit_userid', 'guest')
+#
+# [*oslomsg_notify_password*]
+#   Password for oslo messaging notify service
+#   Defaults to hiera('barbican::api::rabbit_password')
+#
+# [*oslomsg_use_ssl*]
+#   Enable ssl oslo messaging services
+#   Defaults to hiera('barbican::api::rabbit_use_ssl', '0')
+
 class tripleo::profile::base::barbican::api (
   $barbican_network              = hiera('barbican_api_network', undef),
   $bootstrap_node                = hiera('bootstrap_nodeid', undef),
@@ -63,6 +107,17 @@ class tripleo::profile::base::barbican::api (
   $enable_internal_tls           = hiera('enable_internal_tls', false),
   $generate_service_certificates = hiera('generate_service_certificates', false),
   $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('barbican::api::rabbit_password'),
+  $oslomsg_rpc_port              = hiera('barbican::api::rabbit_port', '5672'),
+  $oslomsg_rpc_username          = hiera('barbican::api::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('barbican::api::rabbit_password'),
+  $oslomsg_notify_port           = hiera('barbican::api::rabbit_port', '5672'),
+  $oslomsg_notify_username       = hiera('barbican::api::rabbit_userid', 'guest'),
+  $oslomsg_use_ssl               = hiera('barbican::api::rabbit_use_ssl', '0'),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
@@ -92,8 +147,25 @@ class tripleo::profile::base::barbican::api (
   }
 
   if $step >= 4 or ( $step >= 3 and $sync_db ) {
+    $oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
     class { '::barbican::api':
-      sync_db => $sync_db
+      sync_db                    => $sync_db,
+      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 ::barbican::keystone::authtoken
     include ::barbican::api::logging
diff --git a/manifests/profile/base/ceilometer.pp b/manifests/profile/base/ceilometer.pp
index bbe7f27..61575d1 100644
--- a/manifests/profile/base/ceilometer.pp
+++ b/manifests/profile/base/ceilometer.pp
@@ -23,24 +23,84 @@
 #   for more details.
 #   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('ceilometer::rabbit_port', 5672)
+#
+# [*oslomsg_rpc_username*]
+#   Username for oslo messaging rpc service
+#   Defaults to hiera('ceilometer::rabbit_userid', 'guest')
+#
+# [*oslomsg_rpc_password*]
+#   Password for oslo messaging rpc service
+#   Defaults to hiera('ceilometer::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('ceilometer::rabbit_port', 5672)
+#
+# [*oslomsg_notify_username*]
+#   Username for oslo messaging notify service
+#   Defaults to hiera('ceilometer::rabbit_userid', 'guest')
+#
+# [*oslomsg_notify_password*]
+#   Password for oslo messaging notify service
+#   Defaults to hiera('ceilometer::rabbit_password')
+#
+# [*oslomsg_use_ssl*]
+#   Enable ssl oslo messaging services
+#   Defaults to hiera('ceilometer::rabbit_use_ssl', '0')
 
 class tripleo::profile::base::ceilometer (
-  $step          = hiera('step'),
-  $rabbit_hosts  = hiera('rabbitmq_node_names', undef),
-  $rabbit_port   = hiera('ceilometer::rabbit_port', 5672),
+  $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('ceilometer::rabbit_password'),
+  $oslomsg_rpc_port        = hiera('ceilometer::rabbit_port', '5672'),
+  $oslomsg_rpc_username    = hiera('ceilometer::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('ceilometer::rabbit_password'),
+  $oslomsg_notify_port     = hiera('ceilometer::rabbit_port', '5672'),
+  $oslomsg_notify_username = hiera('ceilometer::rabbit_userid', 'guest'),
+  $oslomsg_use_ssl         = hiera('ceilometer::rabbit_use_ssl', '0'),
 ) {
 
   if $step >= 3 {
-    $rabbit_endpoints = suffix(any2array($rabbit_hosts), ":${rabbit_port}")
+    $oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
     class { '::ceilometer' :
-      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 ::ceilometer::config
   }
diff --git a/manifests/profile/base/cinder.pp b/manifests/profile/base/cinder.pp
index 6e8fbb2..d6fad03 100644
--- a/manifests/profile/base/cinder.pp
+++ b/manifests/profile/base/cinder.pp
@@ -30,20 +30,65 @@
 #   (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')
+#
+# [*oslomsg_rpc_port*]
+#   IP port for oslo messaging rpc service
+#   Defaults to hiera('cinder::rabbit_port', 5672)
+#
+# [*oslomsg_rpc_username*]
+#   Username for oslo messaging rpc service
+#   Defaults to hiera('cinder::rabbit_userid', 'guest')
+#
+# [*oslomsg_rpc_password*]
+#   Password for oslo messaging rpc service
+#   Defaults to hiera('cinder::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')
 #
-# [*rabbit_port*]
-#   IP port for rabbitmq service
+# [*oslomsg_notify_port*]
+#   IP port for oslo messaging notify service
 #   Defaults to hiera('cinder::rabbit_port', 5672)
+#
+# [*oslomsg_notify_username*]
+#   Username for oslo messaging notify service
+#   Defaults to hiera('cinder::rabbit_userid', 'guest')
+#
+# [*oslomsg_notify_password*]
+#   Password for oslo messaging notify service
+#   Defaults to hiera('cinder::rabbit_password')
+#
+# [*oslomsg_use_ssl*]
+#   Enable ssl oslo messaging services
+#   Defaults to hiera('cinder::rabbit_use_ssl', '0')
 
 class tripleo::profile::base::cinder (
-  $bootstrap_node         = hiera('bootstrap_nodeid', undef),
-  $cinder_enable_db_purge = true,
-  $step                   = hiera('step'),
-  $rabbit_hosts           = hiera('rabbitmq_node_names', undef),
-  $rabbit_port            = hiera('cinder::rabbit_port', 5672),
+  $bootstrap_node          = hiera('bootstrap_nodeid', undef),
+  $cinder_enable_db_purge  = true,
+  $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('cinder::rabbit_password'),
+  $oslomsg_rpc_port        = hiera('cinder::rabbit_port', '5672'),
+  $oslomsg_rpc_username    = hiera('cinder::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('cinder::rabbit_password'),
+  $oslomsg_notify_port     = hiera('cinder::rabbit_port', '5672'),
+  $oslomsg_notify_username = hiera('cinder::rabbit_userid', 'guest'),
+  $oslomsg_use_ssl         = hiera('cinder::rabbit_use_ssl', '0'),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
@@ -52,9 +97,26 @@ class tripleo::profile::base::cinder (
   }
 
   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 { '::cinder' :
-      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,
+      }),
+    }
+    class { '::cinder::ceilometer' :
+      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 ::cinder::config
     include ::cinder::glance
diff --git a/manifests/profile/base/congress.pp b/manifests/profile/base/congress.pp
index 1731e81..3d1a693 100644
--- a/manifests/profile/base/congress.pp
+++ b/manifests/profile/base/congress.pp
@@ -22,43 +22,43 @@
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
 #   Defaults to hiera('bootstrap_nodeid')
 #
-# [*messaging_driver*]
-#   Driver for messaging service.
-#   Defaults to hiera('messaging_service_name', 'rabbit')
+# [*step*]
+#   (Optional) The current step of the deployment
+#   Defaults to hiera('step')
 #
-# [*messaging_hosts*]
-#   list of the messaging host fqdns
-#   Defaults to hiera('rabbitmq_node_names')
+# [*oslomsg_rpc_proto*]
+#   Protocol driver for the oslo messaging rpc service
+#   Defaults to hiera('messaging_rpc_service_name', rabbit)
 #
-# [*messaging_password*]
-#   Password for messaging congress queue
-#   Defaults to hiera('congress::rabbit_password')
+# [*oslomsg_rpc_hosts*]
+#   list of the oslo messaging rpc host fqdns
+#   Defaults to hiera('rabbitmq_node_names')
 #
-# [*messaging_port*]
-#   IP port for messaging service
+# [*oslomsg_rpc_port*]
+#   IP port for oslo messaging rpc service
 #   Defaults to hiera('congress::rabbit_port', 5672)
 #
-# [*messaging_username*]
-#   Username for messaging congress queue
+# [*oslomsg_rpc_username*]
+#   Username for oslo messaging rpc service
 #   Defaults to hiera('congress::rabbit_userid', 'guest')
 #
-# [*messaging_use_ssl*]
-#   Flag indicating ssl usage.
-#   Defaults to hiera('congress::rabbit_use_ssl', '0')
+# [*oslomsg_rpc_password*]
+#   Password for oslo messaging rpc service
+#   Defaults to hiera('congress::rabbit_password')
 #
-# [*step*]
-#   (Optional) The current step of the deployment
-#   Defaults to hiera('step')
+# [*oslomsg_use_ssl*]
+#   Enable ssl oslo messaging services
+#   Defaults to hiera('congress::rabbit_use_ssl', '0')
 
 class tripleo::profile::base::congress (
   $bootstrap_node       = hiera('bootstrap_nodeid', undef),
-  $messaging_driver     = hiera('messaging_service_name', 'rabbit'),
-  $messaging_hosts      = any2array(hiera('rabbitmq_node_names', undef)),
-  $messaging_password   = hiera('congress::rabbit_password'),
-  $messaging_port       = hiera('congress::rabbit_port', '5672'),
-  $messaging_username   = hiera('congress::rabbit_userid', 'guest'),
-  $messaging_use_ssl    = hiera('congress::rabbit_use_ssl', '0'),
   $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('congress::rabbit_password'),
+  $oslomsg_rpc_port     = hiera('congress::rabbit_port', '5672'),
+  $oslomsg_rpc_username = hiera('congress::rabbit_userid', 'guest'),
+  $oslomsg_use_ssl      = hiera('congress::rabbit_use_ssl', '0'),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
@@ -67,16 +67,16 @@ class tripleo::profile::base::congress (
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db){
-    $messaging_use_ssl_real = sprintf('%s', bool2num(str2bool($messaging_use_ssl)))
+    $oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
     class { '::congress':
       sync_db               => $sync_db,
       default_transport_url => os_transport_url({
-        'transport' => $messaging_driver,
-        'hosts'     => $messaging_hosts,
-        'port'      => sprintf('%s', $messaging_port),
-        'username'  => $messaging_username,
-        'password'  => $messaging_password,
-        'ssl'       => $messaging_use_ssl_real,
+        '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,
       }),
     }
 
diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp
index 1b3cc75..171f51b 100644
--- a/manifests/profile/base/heat.pp
+++ b/manifests/profile/base/heat.pp
@@ -26,51 +26,75 @@
 #   (Optional) Whether keystone token flushing should be enabled
 #   Defaults to hiera('keystone_enable_db_purge', true)
 #
-# [*messaging_driver*]
-#   Driver for messaging service.
-#   Defaults to hiera('messaging_service_name', 'rabbit')
+# [*notification_driver*]
+#   (Optional) Heat notification driver to use.
+#   Defaults to 'messaging'
 #
-# [*messaging_hosts*]
-#   list of the messaging host fqdns
-#   Defaults to hiera('rabbitmq_node_names')
+# [*step*]
+#   (Optional) The current step in deployment. See tripleo-heat-templates
+#   for more details.
+#   Defaults to hiera('step')
 #
-# [*messaging_password*]
-#   Password for messaging heat queue
-#   Defaults to hiera('heat::rabbit_password')
+# [*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')
 #
-# [*messaging_port*]
-#   IP port for messaging service
+# [*oslomsg_rpc_port*]
+#   IP port for oslo messaging rpc service
 #   Defaults to hiera('heat::rabbit_port', 5672)
 #
-# [*messaging_username*]
-#   Username for messaging heat queue
+# [*oslomsg_rpc_username*]
+#   Username for oslo messaging rpc service
 #   Defaults to hiera('heat::rabbit_userid', 'guest')
 #
-# [*messaging_use_ssl*]
-#   Flag indicating ssl usage.
-#   Defaults to hiera('heat::rabbit_use_ssl', '0')
+# [*oslomsg_rpc_password*]
+#   Password for oslo messaging rpc service
+#   Defaults to hiera('heat::rabbit_password')
 #
-# [*notification_driver*]
-#   (Optional) Heat notification driver to use.
-#   Defaults to 'messaging'
+# [*oslomsg_notify_proto*]
+#   Protocol driver for the oslo messaging notify service
+#   Defaults to hiera('messaging_notify_service_name', rabbit)
 #
-# [*step*]
-#   (Optional) The current step in deployment. See tripleo-heat-templates
-#   for more details.
-#   Defaults to hiera('step')
+# [*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('heat::rabbit_port', 5672)
+#
+# [*oslomsg_notify_username*]
+#   Username for oslo messaging notify service
+#   Defaults to hiera('heat::rabbit_userid', 'guest')
 #
+# [*oslomsg_notify_password*]
+#   Password for oslo messaging notify service
+#   Defaults to hiera('heat::rabbit_password')
+#
+# [*oslomsg_use_ssl*]
+#   Enable ssl oslo messaging services
+#   Defaults to hiera('heat::rabbit_use_ssl', '0')
 
 class tripleo::profile::base::heat (
-  $bootstrap_node      = downcase(hiera('bootstrap_nodeid')),
-  $manage_db_purge     = hiera('heat_enable_db_purge', true),
-  $messaging_driver    = hiera('messaging_service_name', 'rabbit'),
-  $messaging_hosts     = any2array(hiera('rabbitmq_node_names', undef)),
-  $messaging_password  = hiera('heat::rabbit_password'),
-  $messaging_port      = hiera('heat::rabbit_port', '5672'),
-  $messaging_username  = hiera('heat::rabbit_userid', 'guest'),
-  $messaging_use_ssl   = hiera('heat::rabbit_use_ssl', '0'),
-  $notification_driver = 'messaging',
-  $step                = hiera('step'),
+  $bootstrap_node          = downcase(hiera('bootstrap_nodeid')),
+  $manage_db_purge         = hiera('heat_enable_db_purge', true),
+  $notification_driver     = 'messaging',
+  $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('heat::rabbit_password'),
+  $oslomsg_rpc_port        = hiera('heat::rabbit_port', '5672'),
+  $oslomsg_rpc_username    = hiera('heat::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('heat::rabbit_password'),
+  $oslomsg_notify_port     = hiera('heat::rabbit_port', '5672'),
+  $oslomsg_notify_username = hiera('heat::rabbit_userid', 'guest'),
+  $oslomsg_use_ssl         = hiera('heat::rabbit_use_ssl', '0'),
 ) {
   # Domain resources will be created at step5 on the node running keystone.pp
   # configure heat.conf at step3 and 4 but actually create the domain later.
@@ -81,19 +105,27 @@ class tripleo::profile::base::heat (
       manage_role   => false,
     }
 
-    $messaging_use_ssl_real = sprintf('%s', bool2num(str2bool($messaging_use_ssl)))
+    $oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
 
     # TODO(ccamacho): remove sprintf once we properly type the port, needs
     # to be a string for the os_transport_url function.
     class { '::heat' :
-      notification_driver   => $notification_driver,
-      default_transport_url => os_transport_url({
-        'transport' => $messaging_driver,
-        'hosts'     => $messaging_hosts,
-        'password'  => $messaging_password,
-        'port'      => sprintf('%s', $messaging_port),
-        'username'  => $messaging_username,
-        'ssl'       => $messaging_use_ssl_real,
+      notification_driver        => $notification_driver,
+      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 ::heat::config
diff --git a/manifests/profile/base/ironic.pp b/manifests/profile/base/ironic.pp
index 94619ad..7ba629f 100644
--- a/manifests/profile/base/ironic.pp
+++ b/manifests/profile/base/ironic.pp
@@ -26,19 +26,39 @@
 #   (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('ironic::rabbit_port', 5672)
+#
+# [*oslomsg_rpc_username*]
+#   Username for oslo messaging rpc service
+#   Defaults to hiera('ironic::rabbit_userid', 'guest')
+#
+# [*oslomsg_rpc_password*]
+#   Password for oslo messaging rpc service
+#   Defaults to hiera('ironic::rabbit_password')
+#
+# [*oslomsg_use_ssl*]
+#   Enable ssl oslo messaging services
+#   Defaults to hiera('ironic::rabbit_use_ssl', '0')
 
 class tripleo::profile::base::ironic (
-  $bootstrap_node = hiera('bootstrap_nodeid', undef),
-  $step           = hiera('step'),
-  $rabbit_hosts   = hiera('rabbitmq_node_names', undef),
-  $rabbit_port    = hiera('ironic::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('ironic::rabbit_password'),
+  $oslomsg_rpc_port     = hiera('ironic::rabbit_port', '5672'),
+  $oslomsg_rpc_username = hiera('ironic::rabbit_userid', 'guest'),
+  $oslomsg_use_ssl      = hiera('ironic::rabbit_use_ssl', '0'),
 ) {
   # Database is accessed by both API and conductor, hence it's here.
   if $::hostname == downcase($bootstrap_node) {
@@ -48,10 +68,17 @@ class tripleo::profile::base::ironic (
   }
 
   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 { '::ironic':
-      sync_db      => $sync_db,
-      rabbit_hosts => $rabbit_endpoints,
+      sync_db               => $sync_db,
+      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,
+      }),
     }
 
     include ::ironic::config
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index 999bcf6..994caad 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -76,15 +76,50 @@
 #   This is set by t-h-t.
 #   Defaults to hiera('keystone_public_api_network', undef)
 #
+# [*oslomsg_rpc_proto*]
+#   Protocol driver for the oslo messaging rpc service
+#   Defaults to hiera('messaging_rpc_service_name', rabbit)
 #
-# [*rabbit_hosts*]
-#   list of the rabbbit host fqdns
+# [*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('keystone::rabbit_port', 5672)
 #
+# [*oslomsg_rpc_username*]
+#   Username for oslo messaging rpc service
+#   Defaults to hiera('keystone::rabbit_userid', 'guest')
+#
+# [*oslomsg_rpc_password*]
+#   Password for oslo messaging rpc service
+#   Defaults to hiera('keystone::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('keystone::rabbit_port', 5672)
+#
+# [*oslomsg_notify_username*]
+#   Username for oslo messaging notify service
+#   Defaults to hiera('keystone::rabbit_userid', 'guest')
+#
+# [*oslomsg_notify_password*]
+#   Password for oslo messaging notify service
+#   Defaults to hiera('keystone::rabbit_password')
+#
+# [*oslomsg_use_ssl*]
+#   Enable ssl oslo messaging services
+#   Defaults to hiera('keystone::rabbit_use_ssl', '0')
+#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
@@ -102,8 +137,17 @@ class tripleo::profile::base::keystone (
   $heat_admin_user               = undef,
   $manage_db_purge               = hiera('keystone_enable_db_purge', true),
   $public_endpoint_network       = hiera('keystone_public_api_network', undef),
-  $rabbit_hosts                  = hiera('rabbitmq_node_names', undef),
-  $rabbit_port                   = hiera('keystone::rabbit_port', 5672),
+  $oslomsg_rpc_proto             = hiera('messaging_rpc_service_name', 'rabbit'),
+  $oslomsg_rpc_hosts             = any2array(hiera('rabbitmq_node_names', undef)),
+  $oslomsg_rpc_password          = hiera('keystone::rabbit_password'),
+  $oslomsg_rpc_port              = hiera('keystone::rabbit_port', '5672'),
+  $oslomsg_rpc_username          = hiera('keystone::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('keystone::rabbit_password'),
+  $oslomsg_notify_port           = hiera('keystone::rabbit_port', '5672'),
+  $oslomsg_notify_username       = hiera('keystone::rabbit_userid', 'guest'),
+  $oslomsg_use_ssl               = hiera('keystone::rabbit_use_ssl', '0'),
   $step                          = hiera('step'),
 ) {
   if $::hostname == downcase($bootstrap_node) {
@@ -142,11 +186,26 @@ class tripleo::profile::base::keystone (
   }
 
   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 { '::keystone':
-      sync_db          => $sync_db,
-      enable_bootstrap => $sync_db,
-      rabbit_hosts     => $rabbit_endpoints,
+      sync_db                    => $sync_db,
+      enable_bootstrap           => $sync_db,
+      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 ::keystone::config
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
   }
diff --git a/manifests/profile/base/mistral.pp b/manifests/profile/base/mistral.pp
index d8e1330..05773ac 100644
--- a/manifests/profile/base/mistral.pp
+++ b/manifests/profile/base/mistral.pp
@@ -27,19 +27,64 @@
 #   for more details.
 #   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('mistral::rabbit_port', 5672)
+#
+# [*oslomsg_rpc_username*]
+#   Username for oslo messaging rpc service
+#   Defaults to hiera('mistral::rabbit_userid', 'guest')
+#
+# [*oslomsg_rpc_password*]
+#   Password for oslo messaging rpc service
+#   Defaults to hiera('mistral::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('mistral::rabbit_port', 5672)
+#
+# [*oslomsg_notify_username*]
+#   Username for oslo messaging notify service
+#   Defaults to hiera('mistral::rabbit_userid', 'guest')
+#
+# [*oslomsg_notify_password*]
+#   Password for oslo messaging notify service
+#   Defaults to hiera('mistral::rabbit_password')
+#
+# [*oslomsg_use_ssl*]
+#   Enable ssl oslo messaging services
+#   Defaults to hiera('mistral::rabbit_use_ssl', '0')
 
 class tripleo::profile::base::mistral (
-  $bootstrap_node = hiera('bootstrap_nodeid', undef),
-  $step           = hiera('step'),
-  $rabbit_hosts   = hiera('rabbitmq_node_names', undef),
-  $rabbit_port    = hiera('mistral::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('mistral::rabbit_password'),
+  $oslomsg_rpc_port        = hiera('mistral::rabbit_port', '5672'),
+  $oslomsg_rpc_username    = hiera('mistral::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('mistral::rabbit_password'),
+  $oslomsg_notify_port     = hiera('mistral::rabbit_port', '5672'),
+  $oslomsg_notify_username = hiera('mistral::rabbit_userid', 'guest'),
+  $oslomsg_use_ssl         = hiera('mistral::rabbit_use_ssl', '0'),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
@@ -48,9 +93,24 @@ class tripleo::profile::base::mistral (
   }
 
   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  { '::mistral':
-      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 ::mistral::config
     include ::mistral::client
diff --git a/manifests/profile/base/neutron.pp b/manifests/profile/base/neutron.pp
index e6a32db..271003e 100644
--- a/manifests/profile/base/neutron.pp
+++ b/manifests/profile/base/neutron.pp
@@ -22,23 +22,83 @@
 #   (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')
+#
+# [*oslomsg_rpc_port*]
+#   IP port for oslo messaging rpc service
+#   Defaults to hiera('neutron::rabbit_port', 5672)
+#
+# [*oslomsg_rpc_username*]
+#   Username for oslo messaging rpc service
+#   Defaults to hiera('neutron::rabbit_userid', 'guest')
+#
+# [*oslomsg_rpc_password*]
+#   Password for oslo messaging rpc service
+#   Defaults to hiera('neutron::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')
 #
-# [*rabbit_port*]
-#   IP port for rabbitmq service
-#   Defaults to hiera('neutron::rabbit_port', 5672
+# [*oslomsg_notify_port*]
+#   IP port for oslo messaging notify service
+#   Defaults to hiera('neutron::rabbit_port', 5672)
+#
+# [*oslomsg_notify_username*]
+#   Username for oslo messaging notify service
+#   Defaults to hiera('neutron::rabbit_userid', 'guest')
+#
+# [*oslomsg_notify_password*]
+#   Password for oslo messaging notify service
+#   Defaults to hiera('neutron::rabbit_password')
+#
+# [*oslomsg_use_ssl*]
+#   Enable ssl oslo messaging services
+#   Defaults to hiera('neutron::rabbit_use_ssl', '0')
 
 class tripleo::profile::base::neutron (
-  $step         = hiera('step'),
-  $rabbit_hosts = hiera('rabbitmq_node_names', undef),
-  $rabbit_port  = hiera('neutron::rabbit_port', 5672),
+  $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('neutron::rabbit_password'),
+  $oslomsg_rpc_port        = hiera('neutron::rabbit_port', '5672'),
+  $oslomsg_rpc_username    = hiera('neutron::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('neutron::rabbit_password'),
+  $oslomsg_notify_port     = hiera('neutron::rabbit_port', '5672'),
+  $oslomsg_notify_username = hiera('neutron::rabbit_userid', 'guest'),
+  $oslomsg_use_ssl         = hiera('neutron::rabbit_use_ssl', '0'),
 ) {
   if $step >= 3 {
-    $rabbit_endpoints = suffix(any2array($rabbit_hosts), ":${rabbit_port}")
+    $oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
     class { '::neutron' :
-      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 ::neutron::config
   }
diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp
index cb34521..7daed83 100644
--- a/manifests/profile/base/nova.pp
+++ b/manifests/profile/base/nova.pp
@@ -30,28 +30,48 @@
 #   (Optional) Whether or not manage Nova Live migration
 #   Defaults to false
 #
-# [*messaging_driver*]
-#   Driver for messaging service.
-#   Defaults to hiera('messaging_service_name', 'rabbit')
+# [*oslomsg_rpc_proto*]
+#   Protocol driver for the oslo messaging rpc service
+#   Defaults to hiera('messaging_rpc_service_name', rabbit)
 #
-# [*messaging_hosts*]
-#   list of the messaging host fqdns
+# [*oslomsg_rpc_hosts*]
+#   list of the oslo messaging rpc host fqdns
 #   Defaults to hiera('rabbitmq_node_names')
 #
-# [*messaging_password*]
-#   Password for messaging nova queue
+# [*oslomsg_rpc_port*]
+#   IP port for oslo messaging rpc service
+#   Defaults to hiera('nova::rabbit_port', 5672)
+#
+# [*oslomsg_rpc_username*]
+#   Username for oslo messaging rpc service
+#   Defaults to hiera('nova::rabbit_userid', 'guest')
+#
+# [*oslomsg_rpc_password*]
+#   Password for oslo messaging rpc service
 #   Defaults to hiera('nova::rabbit_password')
 #
-# [*messaging_port*]
-#   IP port for messaging service
+# [*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('nova::rabbit_port', 5672)
 #
-# [*messaging_username*]
-#   Username for messaging nova queue
+# [*oslomsg_notify_username*]
+#   Username for oslo messaging notify service
 #   Defaults to hiera('nova::rabbit_userid', 'guest')
 #
-# [*messaging_use_ssl*]
-#   Flag indicating ssl usage.
+# [*oslomsg_notify_password*]
+#   Password for oslo messaging notify service
+#   Defaults to hiera('nova::rabbit_password')
+#
+# [*oslomsg_use_ssl*]
+#   Enable ssl oslo messaging services
 #   Defaults to hiera('nova::rabbit_use_ssl', '0')
 #
 # [*nova_compute_enabled*]
@@ -63,17 +83,22 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::nova (
-  $bootstrap_node       = hiera('bootstrap_nodeid', undef),
-  $libvirt_enabled      = false,
-  $manage_migration     = false,
-  $messaging_driver     = hiera('messaging_service_name', 'rabbit'),
-  $messaging_hosts      = any2array(hiera('rabbitmq_node_names', undef)),
-  $messaging_password   = hiera('nova::rabbit_password'),
-  $messaging_port       = hiera('nova::rabbit_port', '5672'),
-  $messaging_username   = hiera('nova::rabbit_userid', 'guest'),
-  $messaging_use_ssl    = hiera('nova::rabbit_use_ssl', '0'),
-  $nova_compute_enabled = false,
-  $step                 = hiera('step'),
+  $bootstrap_node          = hiera('bootstrap_nodeid', undef),
+  $libvirt_enabled         = false,
+  $manage_migration        = false,
+  $oslomsg_rpc_proto       = hiera('messaging_rpc_service_name', 'rabbit'),
+  $oslomsg_rpc_hosts       = any2array(hiera('rabbitmq_node_names', undef)),
+  $oslomsg_rpc_password    = hiera('nova::rabbit_password'),
+  $oslomsg_rpc_port        = hiera('nova::rabbit_port', '5672'),
+  $oslomsg_rpc_username    = hiera('nova::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('nova::rabbit_password'),
+  $oslomsg_notify_port     = hiera('nova::rabbit_port', '5672'),
+  $oslomsg_notify_username = hiera('nova::rabbit_userid', 'guest'),
+  $oslomsg_use_ssl         = hiera('nova::rabbit_use_ssl', '0'),
+  $nova_compute_enabled    = false,
+  $step                    = hiera('step'),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
@@ -88,17 +113,25 @@ class tripleo::profile::base::nova (
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
-    $messaging_use_ssl_real = sprintf('%s', bool2num(str2bool($messaging_use_ssl)))
+    $oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
     # TODO(ccamacho): remove sprintf once we properly type the port, needs
     # to be a string for the os_transport_url function.
     class { '::nova' :
-      default_transport_url => os_transport_url({
-        'transport' => $messaging_driver,
-        'hosts'     => $messaging_hosts,
-        'port'      => sprintf('%s', $messaging_port),
-        'username'  => $messaging_username,
-        'password'  => $messaging_password,
-        'ssl'       => $messaging_use_ssl_real,
+      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 ::nova::config
diff --git a/manifests/profile/base/octavia.pp b/manifests/profile/base/octavia.pp
index 46ca009..e8310d8 100644
--- a/manifests/profile/base/octavia.pp
+++ b/manifests/profile/base/octavia.pp
@@ -22,35 +22,50 @@
 #   (Optional) The current step of the deployment
 #   Defaults to hiera('step')
 #
-# [*rabbit_user*]
-# [*rabbit_password*]
-#  (Optional) RabbitMQ user details
-#  Defaults to undef
+# [*oslomsg_rpc_proto*]
+#   Protocol driver for the oslo messaging rpc service
+#   Defaults to hiera('messaging_rpc_service_name', rabbit)
 #
-# [*rabbit_hosts*]
-#   list of the rabbbit host fqdns
+# [*oslomsg_rpc_hosts*]
+#   list of the oslo messaging rpc host fqdns
 #   Defaults to hiera('rabbitmq_node_names')
 #
-# [*rabbit_port*]
-#   IP port for rabbitmq service
-#   Defaults to 5672.
+# [*oslomsg_rpc_port*]
+#   IP port for oslo messaging rpc service
+#   Defaults to hiera('octavia::rabbit_port', 5672)
 #
+# [*oslomsg_rpc_username*]
+#   Username for oslo messaging rpc service
+#   Defaults to hiera('octavia::rabbit_userid', 'guest')
+#
+# [*oslomsg_rpc_password*]
+#   Password for oslo messaging rpc service
+#   Defaults to hiera('octavia::rabbit_password')
+#
+# [*oslomsg_use_ssl*]
+#   Enable ssl oslo messaging services
+#   Defaults to hiera('octavia::rabbit_use_ssl', '0')
+
 class tripleo::profile::base::octavia (
-  $step            = hiera('step'),
-  $rabbit_user     = undef,
-  $rabbit_password = undef,
-  $rabbit_hosts    = hiera('rabbitmq_node_names', undef),
-  $rabbit_port     = '5672'
+  $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('octavia::rabbit_password'),
+  $oslomsg_rpc_port     = hiera('octavia::rabbit_port', '5672'),
+  $oslomsg_rpc_username = hiera('octavia::rabbit_userid', 'guest'),
+  $oslomsg_use_ssl      = hiera('octavia::rabbit_use_ssl', '0'),
 ) {
   if $step >= 3 {
+    $oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
     class { '::octavia' :
       default_transport_url => os_transport_url({
-        'transport' => 'rabbit',
-        'hosts'     => $rabbit_hosts,
-        'port'      => sprintf('%s', $rabbit_port),
-        'username'  => $rabbit_user,
-        'password'  => $rabbit_password
-        })
+        '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,
+        }),
     }
     include ::octavia::config
   }
diff --git a/manifests/profile/base/sahara.pp b/manifests/profile/base/sahara.pp
index 8db071b..9633dc3 100644
--- a/manifests/profile/base/sahara.pp
+++ b/manifests/profile/base/sahara.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')
+#
+# [*oslomsg_rpc_port*]
+#   IP port for oslo messaging rpc service
+#   Defaults to hiera('sahara::rabbit_port', 5672)
+#
+# [*oslomsg_rpc_username*]
+#   Username for oslo messaging rpc service
+#   Defaults to hiera('sahara::rabbit_userid', 'guest')
+#
+# [*oslomsg_rpc_password*]
+#   Password for oslo messaging rpc service
+#   Defaults to hiera('sahara::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')
 #
-# [*rabbit_port*]
-#   IP port for rabbitmq service
+# [*oslomsg_notify_port*]
+#   IP port for oslo messaging notify service
 #   Defaults to hiera('sahara::rabbit_port', 5672)
+#
+# [*oslomsg_notify_username*]
+#   Username for oslo messaging notify service
+#   Defaults to hiera('sahara::rabbit_userid', 'guest')
+#
+# [*oslomsg_notify_password*]
+#   Password for oslo messaging notify service
+#   Defaults to hiera('sahara::rabbit_password')
+#
+# [*oslomsg_use_ssl*]
+#   Enable ssl oslo messaging services
+#   Defaults to hiera('sahara::rabbit_use_ssl', '0')
 
 class tripleo::profile::base::sahara (
-  $bootstrap_node = hiera('bootstrap_nodeid', undef),
-  $step           = hiera('step'),
-  $rabbit_hosts   = hiera('rabbitmq_node_names', undef),
-  $rabbit_port    = hiera('sahara::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('sahara::rabbit_password'),
+  $oslomsg_rpc_port        = hiera('sahara::rabbit_port', '5672'),
+  $oslomsg_rpc_username    = hiera('sahara::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('sahara::rabbit_password'),
+  $oslomsg_notify_port     = hiera('sahara::rabbit_port', '5672'),
+  $oslomsg_notify_username = hiera('sahara::rabbit_userid', 'guest'),
+  $oslomsg_use_ssl         = hiera('sahara::rabbit_use_ssl', '0'),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
@@ -47,10 +92,27 @@ class tripleo::profile::base::sahara (
   }
 
   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 { '::sahara':
-      sync_db      => $sync_db,
-      rabbit_hosts => $rabbit_endpoints,
+      sync_db               => $sync_db,
+      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,
+      }),
+    }
+    class { '::sahara::notify':
+      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,
+      }),
     }
   }
 }
diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp
index 5f3408d..0d9ba68 100644
--- a/manifests/profile/base/swift/proxy.pp
+++ b/manifests/profile/base/swift/proxy.pp
@@ -24,7 +24,7 @@
 #
 # [*ceilometer_messaging_driver*]
 #   Driver for messaging service.
-#   Defaults to hiera('messaging_service_name', 'rabbit')
+#   Defaults to hiera('messaging_notify_service_name', 'rabbit')
 #
 # [*ceilometer_messaging_hosts*]
 #   list of the messaging host fqdns
@@ -61,7 +61,7 @@
 #
 class tripleo::profile::base::swift::proxy (
   $ceilometer_enabled            = true,
-  $ceilometer_messaging_driver   = hiera('messaging_service_name', 'rabbit'),
+  $ceilometer_messaging_driver   = hiera('messaging_notify_service_name', 'rabbit'),
   $ceilometer_messaging_hosts    = any2array(hiera('rabbitmq_node_names', undef)),
   $ceilometer_messaging_password = hiera('swift::proxy::ceilometer::rabbit_password', undef),
   $ceilometer_messaging_port     = hiera('tripleo::profile::base::swift::proxy::rabbit_port', '5672'),
diff --git a/manifests/profile/base/tacker.pp b/manifests/profile/base/tacker.pp
index e9f6b77..fa85ec1 100644
--- a/manifests/profile/base/tacker.pp
+++ b/manifests/profile/base/tacker.pp
@@ -22,29 +22,29 @@
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
 #   Defaults to hiera('bootstrap_nodeid')
 #
-# [*messaging_driver*]
-#   Driver for messaging service.
-#   Defaults to hiera('messaging_service_name', 'rabbit')
+# [*oslomsg_rpc_proto*]
+#   Protocol driver for the oslo messaging rpc service
+#   Defaults to hiera('messaging_rpc_service_name', rabbit)
 #
-# [*messaging_hosts*]
-#   list of the messaging host fqdns
+# [*oslomsg_rpc_hosts*]
+#   list of the oslo messaging rpc host fqdns
 #   Defaults to hiera('rabbitmq_node_names')
 #
-# [*messaging_password*]
-#   Password for messaging nova queue
-#   Defaults to hiera('nova::rabbit_password')
+# [*oslomsg_rpc_port*]
+#   IP port for oslo messaging rpc service
+#   Defaults to hiera('tacker::rabbit_port', 5672)
 #
-# [*messaging_port*]
-#   IP port for messaging service
-#   Defaults to hiera('nova::rabbit_port', 5672)
+# [*oslomsg_rpc_username*]
+#   Username for oslo messaging rpc service
+#   Defaults to hiera('tacker::rabbit_userid', 'guest')
 #
-# [*messaging_username*]
-#   Username for messaging nova queue
-#   Defaults to hiera('nova::rabbit_userid', 'guest')
+# [*oslomsg_rpc_password*]
+#   Password for oslo messaging rpc service
+#   Defaults to hiera('tacker::rabbit_password')
 #
-# [*messaging_use_ssl*]
-#   Flag indicating ssl usage.
-#   Defaults to hiera('nova::rabbit_use_ssl', '0')
+# [*oslomsg_use_ssl*]
+#   Enable ssl oslo messaging services
+#   Defaults to hiera('tacker::rabbit_use_ssl', '0')
 #
 # [*step*]
 #   (Optional) The current step of the deployment
@@ -52,12 +52,12 @@
 
 class tripleo::profile::base::tacker (
   $bootstrap_node       = hiera('bootstrap_nodeid', undef),
-  $messaging_driver     = hiera('messaging_service_name', 'rabbit'),
-  $messaging_hosts      = any2array(hiera('rabbitmq_node_names', undef)),
-  $messaging_password   = hiera('tacker::rabbit_password'),
-  $messaging_port       = hiera('tacker::rabbit_port', '5672'),
-  $messaging_username   = hiera('tacker::rabbit_userid', 'guest'),
-  $messaging_use_ssl    = hiera('tacker::rabbit_use_ssl', '0'),
+  $oslomsg_rpc_proto    = hiera('messaging_rpc_service_name', 'rabbit'),
+  $oslomsg_rpc_hosts    = any2array(hiera('rabbitmq_node_names', undef)),
+  $oslomsg_rpc_password = hiera('tacker::rabbit_password'),
+  $oslomsg_rpc_port     = hiera('tacker::rabbit_port', '5672'),
+  $oslomsg_rpc_username = hiera('tacker::rabbit_userid', 'guest'),
+  $oslomsg_use_ssl      = hiera('tacker::rabbit_use_ssl', '0'),
   $step                 = hiera('step'),
 ) {
   if $::hostname == downcase($bootstrap_node) {
@@ -67,16 +67,16 @@ class tripleo::profile::base::tacker (
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db){
-    $messaging_use_ssl_real = sprintf('%s', bool2num(str2bool($messaging_use_ssl)))
+    $oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
     class { '::tacker':
       sync_db               => $sync_db,
       default_transport_url => os_transport_url({
-        'transport' => $messaging_driver,
-        'hosts'     => $messaging_hosts,
-        'port'      => sprintf('%s', $messaging_port),
-        'username'  => $messaging_username,
-        'password'  => $messaging_password,
-        'ssl'       => $messaging_use_ssl_real,
+        '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,
       }),
     }