10 files changed, 25 insertions, 39 deletions
diff --git a/manifests/profile/pacemaker/neutron/dhcp.pp b/manifests/profile/pacemaker/neutron/dhcp.pp
index d738f21..e76012f 100644
--- a/manifests/profile/pacemaker/neutron/dhcp.pp
+++ b/manifests/profile/pacemaker/neutron/dhcp.pp
@@ -18,20 +18,19 @@
 #
 # === Parameters
 #
+# [*pacemaker_master*]
+#   (Optional) The hostname of the pacemaker master
+#   Defaults to hiera('bootstrap_nodeid', undef)
+#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*pacemaker_master*]
-#   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid', undef)
-#
 class tripleo::profile::pacemaker::neutron::dhcp (
-  $step             = hiera('step'),
   $pacemaker_master = hiera('bootstrap_nodeid', undef),
+  $step             = hiera('step'),
 ) {
-
   include ::neutron::params
   include ::tripleo::profile::pacemaker::neutron
   include ::tripleo::profile::base::neutron::dhcp
diff --git a/manifests/profile/pacemaker/neutron/l3.pp b/manifests/profile/pacemaker/neutron/l3.pp
index fec4af2..c3ae3b8 100644
--- a/manifests/profile/pacemaker/neutron/l3.pp
+++ b/manifests/profile/pacemaker/neutron/l3.pp
@@ -18,20 +18,19 @@
 #
 # === Parameters
 #
+# [*pacemaker_master*]
+#   (Optional) The hostname of the pacemaker master
+#   Defaults to hiera('bootstrap_nodeid', undef)
+#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*pacemaker_master*]
-#   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid', undef)
-#
 class tripleo::profile::pacemaker::neutron::l3 (
-  $step             = hiera('step'),
   $pacemaker_master = hiera('bootstrap_nodeid', undef),
+  $step             = hiera('step'),
 ) {
-
   include ::neutron::params
   include ::tripleo::profile::pacemaker::neutron
   include ::tripleo::profile::base::neutron::l3
diff --git a/manifests/profile/pacemaker/neutron/metadata.pp b/manifests/profile/pacemaker/neutron/metadata.pp
index 4fccea2..f09edba 100644
--- a/manifests/profile/pacemaker/neutron/metadata.pp
+++ b/manifests/profile/pacemaker/neutron/metadata.pp
@@ -18,20 +18,19 @@
 #
 # === Parameters
 #
+# [*pacemaker_master*]
+#   (Optional) The hostname of the pacemaker master
+#   Defaults to hiera('bootstrap_nodeid', undef)
+#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*pacemaker_master*]
-#   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid', undef)
-#
 class tripleo::profile::pacemaker::neutron::metadata (
-  $step             = hiera('step'),
   $pacemaker_master = hiera('bootstrap_nodeid', undef),
+  $step             = hiera('step'),
 ) {
-
   include ::neutron::params
   include ::tripleo::profile::pacemaker::neutron
   include ::tripleo::profile::base::neutron::metadata
diff --git a/manifests/profile/pacemaker/neutron/midonet.pp b/manifests/profile/pacemaker/neutron/midonet.pp
index 9d380f0..453641a 100644
--- a/manifests/profile/pacemaker/neutron/midonet.pp
+++ b/manifests/profile/pacemaker/neutron/midonet.pp
@@ -18,18 +18,18 @@
 #
 # === Parameters
 #
+# [*pacemaker_master*]
+#   (Optional) The hostname of the pacemaker master
+#   Defaults to hiera('bootstrap_nodeid', undef)
+#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*pacemaker_master*]
-#   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid', undef)
-#
 class tripleo::profile::pacemaker::neutron::midonet (
-  $step             = hiera('step'),
   $pacemaker_master = hiera('bootstrap_nodeid', undef),
+  $step             = hiera('step'),
 ) {
   include ::neutron::params
   include ::tripleo::profile::pacemaker::neutron
diff --git a/manifests/profile/pacemaker/neutron/ovs.pp b/manifests/profile/pacemaker/neutron/ovs.pp
index a330de1..7e3b15c 100644
--- a/manifests/profile/pacemaker/neutron/ovs.pp
+++ b/manifests/profile/pacemaker/neutron/ovs.pp
@@ -18,20 +18,19 @@
 #
 # === Parameters
 #
+# [*pacemaker_master*]
+#   (Optional) The hostname of the pacemaker master
+#   Defaults to hiera('bootstrap_nodeid', undef)
+#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*pacemaker_master*]
-#   (Optional) The hostname of the pacemaker master
-#   Defaults to hiera('bootstrap_nodeid', undef)
-#
 class tripleo::profile::pacemaker::neutron::ovs (
-  $step             = hiera('step'),
   $pacemaker_master = hiera('bootstrap_nodeid', undef),
+  $step             = hiera('step'),
 ) {
-
   include ::neutron::params
   include ::tripleo::profile::pacemaker::neutron
   include ::tripleo::profile::base::neutron::ovs
diff --git a/manifests/profile/pacemaker/neutron/plugins/ml2.pp b/manifests/profile/pacemaker/neutron/plugins/ml2.pp
index e5e13b7..aff682a 100644
--- a/manifests/profile/pacemaker/neutron/plugins/ml2.pp
+++ b/manifests/profile/pacemaker/neutron/plugins/ml2.pp
@@ -20,10 +20,7 @@
 #
 class tripleo::profile::pacemaker::neutron::plugins::ml2
 {
-
   include ::neutron::params
   include ::tripleo::profile::pacemaker::neutron
-
   include ::tripleo::profile::base::neutron::plugins::ml2
-
 }
diff --git a/manifests/profile/pacemaker/neutron/plugins/nuage.pp b/manifests/profile/pacemaker/neutron/plugins/nuage.pp
index de00761..03cdb7e 100644
--- a/manifests/profile/pacemaker/neutron/plugins/nuage.pp
+++ b/manifests/profile/pacemaker/neutron/plugins/nuage.pp
@@ -20,7 +20,5 @@
 #
 class tripleo::profile::pacemaker::neutron::plugins::nuage
 {
-
   include ::tripleo::profile::base::neutron::plugins::nuage
-
 }
diff --git a/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp b/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp
index f1568e9..438245a 100644
--- a/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp
+++ b/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp
@@ -20,7 +20,5 @@
 #
 class tripleo::profile::pacemaker::neutron::plugins::opencontrail
 {
-
   include ::tripleo::profile::base::neutron::plugins::opencontrail
-
 }
diff --git a/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp b/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp
index 7313ef9..38b2179 100644
--- a/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp
+++ b/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp
@@ -20,7 +20,5 @@
 #
 class tripleo::profile::pacemaker::neutron::plugins::plumgrid
 {
-
   include ::tripleo::profile::base::neutron::plugins::plumgrid
-
 }
diff --git a/manifests/profile/pacemaker/neutron/server.pp b/manifests/profile/pacemaker/neutron/server.pp
index acd7993..d817ee7 100644
--- a/manifests/profile/pacemaker/neutron/server.pp
+++ b/manifests/profile/pacemaker/neutron/server.pp
@@ -31,7 +31,6 @@ class tripleo::profile::pacemaker::neutron::server (
   $pacemaker_master = hiera('bootstrap_nodeid', undef),
   $step             = hiera('step'),
 ) {
-
   include ::neutron::params
   include ::tripleo::profile::pacemaker::neutron