Merge "Remove the string cast for using transport_url"

11 files changed, 22 insertions, 24 deletions

diff --git a/manifests/profile/base/aodh.pp b/manifests/profile/base/aodh.pp
index d6561a2..da8aaa6 100644
--- a/manifests/profile/base/aodh.pp
+++ b/manifests/profile/base/aodh.pp
@@ -99,7 +99,7 @@ class tripleo::profile::base::aodh (
       default_transport_url      => os_transport_url({
         'transport' => $oslomsg_rpc_proto,
         'hosts'     => $oslomsg_rpc_hosts,
-        'port'      => sprintf('%s', $oslomsg_rpc_port),
+        'port'      => $oslomsg_rpc_port,
         'username'  => $oslomsg_rpc_username,
         'password'  => $oslomsg_rpc_password,
         'ssl'       => $oslomsg_use_ssl_real,
@@ -107,7 +107,7 @@ class tripleo::profile::base::aodh (
       notification_transport_url => os_transport_url({
         'transport' => $oslomsg_notify_proto,
         'hosts'     => $oslomsg_notify_hosts,
-        'port'      => sprintf('%s', $oslomsg_notify_port),
+        'port'      => $oslomsg_notify_port,
         'username'  => $oslomsg_notify_username,
         'password'  => $oslomsg_notify_password,
         'ssl'       => $oslomsg_use_ssl_real,
diff --git a/manifests/profile/base/barbican/api.pp b/manifests/profile/base/barbican/api.pp
index 64c2b62..22984b1 100644
--- a/manifests/profile/base/barbican/api.pp
+++ b/manifests/profile/base/barbican/api.pp
@@ -153,7 +153,7 @@ class tripleo::profile::base::barbican::api (
       default_transport_url      => os_transport_url({
         'transport' => $oslomsg_rpc_proto,
         'hosts'     => $oslomsg_rpc_hosts,
-        'port'      => sprintf('%s', $oslomsg_rpc_port),
+        'port'      => $oslomsg_rpc_port,
         'username'  => $oslomsg_rpc_username,
         'password'  => $oslomsg_rpc_password,
         'ssl'       => $oslomsg_use_ssl_real,
@@ -161,7 +161,7 @@ class tripleo::profile::base::barbican::api (
       notification_transport_url => os_transport_url({
         'transport' => $oslomsg_notify_proto,
         'hosts'     => $oslomsg_notify_hosts,
-        'port'      => sprintf('%s', $oslomsg_notify_port),
+        'port'      => $oslomsg_notify_port,
         'username'  => $oslomsg_notify_username,
         'password'  => $oslomsg_notify_password,
         'ssl'       => $oslomsg_use_ssl_real,
diff --git a/manifests/profile/base/ceilometer.pp b/manifests/profile/base/ceilometer.pp
index 61575d1..2855bd2 100644
--- a/manifests/profile/base/ceilometer.pp
+++ b/manifests/profile/base/ceilometer.pp
@@ -88,7 +88,7 @@ class tripleo::profile::base::ceilometer (
       default_transport_url      => os_transport_url({
         'transport' => $oslomsg_rpc_proto,
         'hosts'     => $oslomsg_rpc_hosts,
-        'port'      => sprintf('%s', $oslomsg_rpc_port),
+        'port'      => $oslomsg_rpc_port,
         'username'  => $oslomsg_rpc_username,
         'password'  => $oslomsg_rpc_password,
         'ssl'       => $oslomsg_use_ssl_real,
@@ -96,7 +96,7 @@ class tripleo::profile::base::ceilometer (
       notification_transport_url => os_transport_url({
         'transport' => $oslomsg_notify_proto,
         'hosts'     => $oslomsg_notify_hosts,
-        'port'      => sprintf('%s', $oslomsg_notify_port),
+        'port'      => $oslomsg_notify_port,
         'username'  => $oslomsg_notify_username,
         'password'  => $oslomsg_notify_password,
         'ssl'       => $oslomsg_use_ssl_real,
diff --git a/manifests/profile/base/cinder.pp b/manifests/profile/base/cinder.pp
index d6fad03..fc3c659 100644
--- a/manifests/profile/base/cinder.pp
+++ b/manifests/profile/base/cinder.pp
@@ -102,7 +102,7 @@ class tripleo::profile::base::cinder (
       default_transport_url      => os_transport_url({
         'transport' => $oslomsg_rpc_proto,
         'hosts'     => $oslomsg_rpc_hosts,
-        'port'      => sprintf('%s', $oslomsg_rpc_port),
+        'port'      => $oslomsg_rpc_port,
         'username'  => $oslomsg_rpc_username,
         'password'  => $oslomsg_rpc_password,
         'ssl'       => $oslomsg_use_ssl_real,
@@ -112,7 +112,7 @@ class tripleo::profile::base::cinder (
       notification_transport_url => os_transport_url({
         'transport' => $oslomsg_notify_proto,
         'hosts'     => $oslomsg_notify_hosts,
-        'port'      => sprintf('%s', $oslomsg_notify_port),
+        'port'      => $oslomsg_notify_port,
         'username'  => $oslomsg_notify_username,
         'password'  => $oslomsg_notify_password,
         'ssl'       => $oslomsg_use_ssl_real,
diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp
index 171f51b..4ff5b41 100644
--- a/manifests/profile/base/heat.pp
+++ b/manifests/profile/base/heat.pp
@@ -107,14 +107,12 @@ class tripleo::profile::base::heat (
 
     $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' => $oslomsg_rpc_proto,
         'hosts'     => $oslomsg_rpc_hosts,
-        'port'      => sprintf('%s', $oslomsg_rpc_port),
+        'port'      => $oslomsg_rpc_port,
         'username'  => $oslomsg_rpc_username,
         'password'  => $oslomsg_rpc_password,
         'ssl'       => $oslomsg_use_ssl_real,
@@ -122,7 +120,7 @@ class tripleo::profile::base::heat (
       notification_transport_url => os_transport_url({
         'transport' => $oslomsg_notify_proto,
         'hosts'     => $oslomsg_notify_hosts,
-        'port'      => sprintf('%s', $oslomsg_notify_port),
+        'port'      => $oslomsg_notify_port,
         'username'  => $oslomsg_notify_username,
         'password'  => $oslomsg_notify_password,
         'ssl'       => $oslomsg_use_ssl_real,
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index 994caad..00f4aa8 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -193,7 +193,7 @@ class tripleo::profile::base::keystone (
       default_transport_url      => os_transport_url({
         'transport' => $oslomsg_rpc_proto,
         'hosts'     => $oslomsg_rpc_hosts,
-        'port'      => sprintf('%s', $oslomsg_rpc_port),
+        'port'      => $oslomsg_rpc_port,
         'username'  => $oslomsg_rpc_username,
         'password'  => $oslomsg_rpc_password,
         'ssl'       => $oslomsg_use_ssl_real,
@@ -201,7 +201,7 @@ class tripleo::profile::base::keystone (
       notification_transport_url => os_transport_url({
         'transport' => $oslomsg_notify_proto,
         'hosts'     => $oslomsg_notify_hosts,
-        'port'      => sprintf('%s', $oslomsg_notify_port),
+        'port'      => $oslomsg_notify_port,
         'username'  => $oslomsg_notify_username,
         'password'  => $oslomsg_notify_password,
         'ssl'       => $oslomsg_use_ssl_real,
diff --git a/manifests/profile/base/manila.pp b/manifests/profile/base/manila.pp
index 87179ab..cad2cdf 100644
--- a/manifests/profile/base/manila.pp
+++ b/manifests/profile/base/manila.pp
@@ -97,7 +97,7 @@ class tripleo::profile::base::manila (
       default_transport_url      => os_transport_url({
         'transport' => $oslomsg_rpc_proto,
         'hosts'     => $oslomsg_rpc_hosts,
-        'port'      => sprintf('%s', $oslomsg_rpc_port),
+        'port'      => $oslomsg_rpc_port,
         'username'  => $oslomsg_rpc_username,
         'password'  => $oslomsg_rpc_password,
         'ssl'       => $oslomsg_use_ssl_real,
@@ -105,7 +105,7 @@ class tripleo::profile::base::manila (
       notification_transport_url => os_transport_url({
         'transport' => $oslomsg_notify_proto,
         'hosts'     => $oslomsg_notify_hosts,
-        'port'      => sprintf('%s', $oslomsg_notify_port),
+        'port'      => $oslomsg_notify_port,
         'username'  => $oslomsg_notify_username,
         'password'  => $oslomsg_notify_password,
         'ssl'       => $oslomsg_use_ssl_real,
diff --git a/manifests/profile/base/mistral.pp b/manifests/profile/base/mistral.pp
index 05773ac..0eb849d 100644
--- a/manifests/profile/base/mistral.pp
+++ b/manifests/profile/base/mistral.pp
@@ -98,7 +98,7 @@ class tripleo::profile::base::mistral (
       default_transport_url      => os_transport_url({
         'transport' => $oslomsg_rpc_proto,
         'hosts'     => $oslomsg_rpc_hosts,
-        'port'      => sprintf('%s', $oslomsg_rpc_port),
+        'port'      => $oslomsg_rpc_port,
         'username'  => $oslomsg_rpc_username,
         'password'  => $oslomsg_rpc_password,
         'ssl'       => $oslomsg_use_ssl_real,
@@ -106,7 +106,7 @@ class tripleo::profile::base::mistral (
       notification_transport_url => os_transport_url({
         'transport' => $oslomsg_notify_proto,
         'hosts'     => $oslomsg_notify_hosts,
-        'port'      => sprintf('%s', $oslomsg_notify_port),
+        'port'      => $oslomsg_notify_port,
         'username'  => $oslomsg_notify_username,
         'password'  => $oslomsg_notify_password,
         'ssl'       => $oslomsg_use_ssl_real,
diff --git a/manifests/profile/base/neutron.pp b/manifests/profile/base/neutron.pp
index 271003e..0d647f8 100644
--- a/manifests/profile/base/neutron.pp
+++ b/manifests/profile/base/neutron.pp
@@ -86,7 +86,7 @@ class tripleo::profile::base::neutron (
       default_transport_url      => os_transport_url({
         'transport' => $oslomsg_rpc_proto,
         'hosts'     => $oslomsg_rpc_hosts,
-        'port'      => sprintf('%s', $oslomsg_rpc_port),
+        'port'      => $oslomsg_rpc_port,
         'username'  => $oslomsg_rpc_username,
         'password'  => $oslomsg_rpc_password,
         'ssl'       => $oslomsg_use_ssl_real,
@@ -94,7 +94,7 @@ class tripleo::profile::base::neutron (
       notification_transport_url => os_transport_url({
         'transport' => $oslomsg_notify_proto,
         'hosts'     => $oslomsg_notify_hosts,
-        'port'      => sprintf('%s', $oslomsg_notify_port),
+        'port'      => $oslomsg_notify_port,
         'username'  => $oslomsg_notify_username,
         'password'  => $oslomsg_notify_password,
         'ssl'       => $oslomsg_use_ssl_real,
diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp
index 7daed83..f7624f9 100644
--- a/manifests/profile/base/nova.pp
+++ b/manifests/profile/base/nova.pp
@@ -120,7 +120,7 @@ class tripleo::profile::base::nova (
       default_transport_url      => os_transport_url({
         'transport' => $oslomsg_rpc_proto,
         'hosts'     => $oslomsg_rpc_hosts,
-        'port'      => sprintf('%s', $oslomsg_rpc_port),
+        'port'      => $oslomsg_rpc_port,
         'username'  => $oslomsg_rpc_username,
         'password'  => $oslomsg_rpc_password,
         'ssl'       => $oslomsg_use_ssl_real,
@@ -128,7 +128,7 @@ class tripleo::profile::base::nova (
       notification_transport_url => os_transport_url({
         'transport' => $oslomsg_notify_proto,
         'hosts'     => $oslomsg_notify_hosts,
-        'port'      => sprintf('%s', $oslomsg_notify_port),
+        'port'      => $oslomsg_notify_port,
         'username'  => $oslomsg_notify_username,
         'password'  => $oslomsg_notify_password,
         'ssl'       => $oslomsg_use_ssl_real,
diff --git a/manifests/profile/base/sahara.pp b/manifests/profile/base/sahara.pp
index 9633dc3..c9c656d 100644
--- a/manifests/profile/base/sahara.pp
+++ b/manifests/profile/base/sahara.pp
@@ -98,7 +98,7 @@ class tripleo::profile::base::sahara (
       default_transport_url => os_transport_url({
         'transport' => $oslomsg_rpc_proto,
         'hosts'     => $oslomsg_rpc_hosts,
-        'port'      => sprintf('%s', $oslomsg_rpc_port),
+        'port'      => $oslomsg_rpc_port,
         'username'  => $oslomsg_rpc_username,
         'password'  => $oslomsg_rpc_password,
         'ssl'       => $oslomsg_use_ssl_real,
@@ -108,7 +108,7 @@ class tripleo::profile::base::sahara (
       notification_transport_url => os_transport_url({
         'transport' => $oslomsg_notify_proto,
         'hosts'     => $oslomsg_notify_hosts,
-        'port'      => sprintf('%s', $oslomsg_notify_port),
+        'port'      => $oslomsg_notify_port,
         'username'  => $oslomsg_notify_username,
         'password'  => $oslomsg_notify_password,
         'ssl'       => $oslomsg_use_ssl_real,