summaryrefslogtreecommitdiffstats
path: root/manifests/network/contrail/heat.pp
diff options
context:
space:
mode:
authorCarlos Camacho <ccamacho@redhat.com>2017-02-01 21:10:21 +0100
committerCarlos Camacho <ccamacho@redhat.com>2017-02-01 21:35:15 +0100
commitd3190a13189ff8fb2abc5e9c7b996034b4363c9b (patch)
tree98a1fbbecd3feb8a1b68abe1adb2abf44bf4fdd5 /manifests/network/contrail/heat.pp
parent3e85ebb1dfff9803c9d22a61a371d4efb24edaed (diff)
Fix style nits in contrail manifests
There are some style nits in the recently merged contrail puppet manifests. Change-Id: Ice5935105e0323cb55e0d018190e6471ade7324a
Diffstat (limited to 'manifests/network/contrail/heat.pp')
-rw-r--r--manifests/network/contrail/heat.pp30
1 files changed, 12 insertions, 18 deletions
diff --git a/manifests/network/contrail/heat.pp b/manifests/network/contrail/heat.pp
index c8998c9..637fdda 100644
--- a/manifests/network/contrail/heat.pp
+++ b/manifests/network/contrail/heat.pp
@@ -24,26 +24,21 @@
# String value.
# Defaults to hiera('contrail::admin_password')
#
-# [*admin_tenant_name*]
-# (optional) admin tenant name.
-# String value.
-# Defaults to hiera('contrail::admin_tenant_name')
-#
# [*admin_user*]
# (optional) admin user name.
# String value.
# Defaults to hiera('contrail::admin_user')
#
-# [*api_server*]
-# (optional) IP address of api server
-# String value.
-# Defaults to hiera('contrail_config_vip')
-#
# [*api_port*]
# (optional) port of api server
# String value.
# Defaults to hiera('contrail::api_port')
#
+# [*api_server*]
+# (optional) IP address of api server
+# String value.
+# Defaults to hiera('contrail_config_vip')
+#
# [*auth_host*]
# (optional) keystone server ip address
# String (IPv4) value.
@@ -60,16 +55,15 @@
# Defaults to 'False'
#
class tripleo::network::contrail::heat(
- $step = hiera('step'),
- $admin_password = hiera('contrail::admin_password'),
- $admin_user = hiera('contrail::admin_user'),
- $api_server = hiera('contrail_config_vip'),
- $api_port = 8082,
- $auth_host = hiera('contrail::auth_host'),
- $use_ssl = 'False',
+ $admin_password = hiera('contrail::admin_password'),
+ $admin_user = hiera('contrail::admin_user'),
+ $api_port = 8082,
+ $api_server = hiera('contrail_config_vip'),
+ $auth_host = hiera('contrail::auth_host'),
+ $step = hiera('step'),
+ $use_ssl = 'False',
)
{
-
class {'::contrail::heat':
heat_config => {
'clients_contrail' => {