From d3190a13189ff8fb2abc5e9c7b996034b4363c9b Mon Sep 17 00:00:00 2001
From: Carlos Camacho <ccamacho@redhat.com>
Date: Wed, 1 Feb 2017 21:10:21 +0100
Subject: Fix style nits in contrail manifests

There are some style nits in the recently merged contrail puppet manifests.

Change-Id: Ice5935105e0323cb55e0d018190e6471ade7324a
---
 manifests/network/contrail/database.pp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'manifests/network/contrail/database.pp')

diff --git a/manifests/network/contrail/database.pp b/manifests/network/contrail/database.pp
index 9786d8f..f74eb1c 100644
--- a/manifests/network/contrail/database.pp
+++ b/manifests/network/contrail/database.pp
@@ -39,16 +39,16 @@
 #  String value.
 #  Defaults to hiera('contrail::admin_user')
 #
-# [*api_server*]
-#  (optional) VIP of Config API
-#  String (IPv4) value.
-#  Defaults to hiera('contrail_config_vip')
-#
 # [*api_port*]
 #  (optional) Port of Config API
 #  String value.
 #  Defaults to hiera('contrail::api_port')
 #
+# [*api_server*]
+#  (optional) VIP of Config API
+#  String (IPv4) value.
+#  Defaults to hiera('contrail_config_vip')
+#
 # [*auth_host*]
 #  (optional) keystone server ip address
 #  String (IPv4) value.
@@ -104,13 +104,12 @@
 #  Defaults to hiera('contrail_database_node_ips')
 #
 class tripleo::network::contrail::database(
-  $step                 = hiera('step'),
   $admin_password       = hiera('contrail::admin_password'),
   $admin_tenant_name    = hiera('contrail::admin_tenant_name'),
   $admin_token          = hiera('contrail::admin_token'),
   $admin_user           = hiera('contrail::admin_user'),
-  $api_server           = hiera('contrail_config_vip'),
   $api_port             = hiera('contrail::api_port'),
+  $api_server           = hiera('contrail_config_vip'),
   $auth_host            = hiera('contrail::auth_host'),
   $cassandra_servers    = hiera('contrail_database_node_ips'),
   $disc_server_ip       = hiera('contrail_config_vip'),
@@ -118,6 +117,7 @@ class tripleo::network::contrail::database(
   $host_ip              = hiera('contrail::database::host_ip'),
   $host_name            = $::hostname,
   $public_vip           = hiera('public_virtual_ip'),
+  $step                 = hiera('step'),
   $zookeeper_client_ip  = hiera('contrail::database::host_ip'),
   $zookeeper_hostnames  = hiera('contrail_database_short_node_names'),
   $zookeeper_server_ips = hiera('contrail_database_node_ips'),
-- 
cgit 1.2.3-korg