From 689d80e97188342c84bb965980d48c8ed212e60d Mon Sep 17 00:00:00 2001
From: Carlos Camacho <ccamacho@redhat.com>
Date: Fri, 5 Aug 2016 11:54:25 +0200
Subject: Fix parameters and headers inconsistency in the puppet manifests.

As we are staring to manually check overcloud services
the first step is to check that the puppet profiles
are all aligned.

Changes applied:

  No logic added or removed in this submission.

  Removed unused parameters.

  Align header comments structure.

  All profiles parameters sorted following:
  "Mandatory params first sorted alphabetically
  then optional params sorted alphabetically."

Note: Following submissions will check pacemaker,
cinder, mistral and redis services in the base profiles
as some of them has the $pacemaker_master parameter
defaulted to true.

Change-Id: I2f91c3f6baa33f74b5625789eec83233179a9655
---
 manifests/profile/base/ceilometer/agent/central.pp |  2 -
 manifests/profile/base/ceilometer/agent/compute.pp |  2 -
 .../profile/base/ceilometer/agent/notification.pp  |  2 -
 manifests/profile/base/ceilometer/api.pp           |  2 -
 manifests/profile/base/ceilometer/collector.pp     |  2 +-
 manifests/profile/base/ceilometer/expirer.pp       |  2 -
 manifests/profile/base/ceph/client.pp              |  1 -
 manifests/profile/base/ceph/mon.pp                 |  1 -
 manifests/profile/base/ceph/osd.pp                 |  1 -
 manifests/profile/base/cinder.pp                   |  1 -
 manifests/profile/base/cinder/api.pp               |  2 +-
 manifests/profile/base/cinder/scheduler.pp         |  1 -
 manifests/profile/base/cinder/volume.pp            |  1 -
 manifests/profile/base/cinder/volume/dellsc.pp     |  1 -
 manifests/profile/base/cinder/volume/eqlx.pp       |  1 -
 manifests/profile/base/cinder/volume/iscsi.pp      | 17 +++--
 manifests/profile/base/cinder/volume/netapp.pp     |  1 -
 manifests/profile/base/cinder/volume/nfs.pp        | 11 ++--
 manifests/profile/base/cinder/volume/rbd.pp        | 11 ++--
 manifests/profile/base/database/mongodb.pp         |  5 +-
 manifests/profile/base/database/mongodbcommon.pp   |  9 ++-
 manifests/profile/base/database/mysql.pp           | 21 ++++---
 manifests/profile/base/database/redis.pp           | 12 ++--
 manifests/profile/base/glance/api.pp               | 10 +--
 manifests/profile/base/glance/registry.pp          | 10 +--
 manifests/profile/base/gnocchi.pp                  |  2 -
 manifests/profile/base/gnocchi/api.pp              | 12 ++--
 manifests/profile/base/gnocchi/metricd.pp          |  2 -
 manifests/profile/base/gnocchi/statsd.pp           |  2 -
 manifests/profile/base/haproxy.pp                  | 49 ++++++++-------
 manifests/profile/base/heat.pp                     | 25 ++++----
 manifests/profile/base/heat/api.pp                 |  3 +-
 manifests/profile/base/heat/api_cfn.pp             |  3 +-
 manifests/profile/base/heat/api_cloudwatch.pp      |  3 +-
 manifests/profile/base/heat/engine.pp              |  2 +-
 manifests/profile/base/ironic.pp                   |  2 +-
 manifests/profile/base/ironic/api.pp               |  4 +-
 manifests/profile/base/ironic/conductor.pp         |  3 +-
 manifests/profile/base/keepalived.pp               | 10 ++-
 manifests/profile/base/keystone.pp                 | 12 ++--
 manifests/profile/base/manila/api.pp               |  3 +-
 manifests/profile/base/manila/scheduler.pp         |  2 +-
 manifests/profile/base/manila/share.pp             |  4 +-
 manifests/profile/base/memcached.pp                |  4 +-
 manifests/profile/base/mistral.pp                  | 11 ++--
 manifests/profile/base/mistral/api.pp              | 11 ++--
 manifests/profile/base/mistral/engine.pp           | 11 ++--
 manifests/profile/base/mistral/executor.pp         | 13 ++--
 manifests/profile/base/monitoring/fluentd.pp       |  1 -
 manifests/profile/base/monitoring/rabbitmq.pp      | 16 ++---
 manifests/profile/base/monitoring/sensu.pp         |  2 -
 manifests/profile/base/monitoring/uchiwa.pp        |  1 -
 manifests/profile/base/neutron/agents/midonet.pp   | 18 +++---
 manifests/profile/base/neutron/agents/nuage.pp     | 34 +++++-----
 manifests/profile/base/neutron/dhcp.pp             |  2 +-
 manifests/profile/base/neutron/l3.pp               |  6 +-
 manifests/profile/base/neutron/metadata.pp         |  2 +-
 manifests/profile/base/neutron/midonet.pp          | 72 ++++++++++------------
 manifests/profile/base/neutron/ovs.pp              |  1 -
 manifests/profile/base/neutron/plugins/ml2.pp      | 16 ++---
 manifests/profile/base/neutron/plugins/nuage.pp    |  2 +-
 .../profile/base/neutron/plugins/opencontrail.pp   |  2 +-
 manifests/profile/base/neutron/plugins/plumgrid.pp |  2 +-
 manifests/profile/base/nova.pp                     | 18 +++---
 manifests/profile/base/nova/compute/ironic.pp      |  2 -
 manifests/profile/base/nova/compute/libvirt.pp     |  1 -
 manifests/profile/base/nova/conductor.pp           |  2 -
 manifests/profile/base/nova/consoleauth.pp         |  2 -
 manifests/profile/base/nova/libvirt.pp             |  1 -
 manifests/profile/base/nova/scheduler.pp           |  2 -
 manifests/profile/base/nova/vncproxy.pp            |  2 -
 manifests/profile/base/pacemaker.pp                |  1 -
 manifests/profile/base/rabbitmq.pp                 | 27 ++++----
 manifests/profile/base/sahara/api.pp               |  2 +-
 manifests/profile/base/sahara/engine.pp            |  2 +-
 manifests/profile/base/snmp.pp                     | 19 +++---
 manifests/profile/base/swift/add_devices.pp        |  3 +-
 manifests/profile/base/swift/proxy.pp              |  2 -
 manifests/profile/base/swift/ringbuilder.pp        | 33 +++++-----
 manifests/profile/base/swift/storage.pp            | 11 ++--
 manifests/profile/base/trove/api.pp                |  2 +-
 81 files changed, 271 insertions(+), 360 deletions(-)

(limited to 'manifests/profile/base')

diff --git a/manifests/profile/base/ceilometer/agent/central.pp b/manifests/profile/base/ceilometer/agent/central.pp
index 02d6d1a..c91e610 100644
--- a/manifests/profile/base/ceilometer/agent/central.pp
+++ b/manifests/profile/base/ceilometer/agent/central.pp
@@ -23,11 +23,9 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
-
 class tripleo::profile::base::ceilometer::agent::central (
   $step = hiera('step'),
 ) {
-
   include ::tripleo::profile::base::ceilometer
 
   if $step >= 4 {
diff --git a/manifests/profile/base/ceilometer/agent/compute.pp b/manifests/profile/base/ceilometer/agent/compute.pp
index 3a7aa50..749bc64 100644
--- a/manifests/profile/base/ceilometer/agent/compute.pp
+++ b/manifests/profile/base/ceilometer/agent/compute.pp
@@ -23,11 +23,9 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
-
 class tripleo::profile::base::ceilometer::agent::compute (
   $step = hiera('step'),
 ) {
-
   include ::tripleo::profile::base::ceilometer
 
   if $step >= 4 {
diff --git a/manifests/profile/base/ceilometer/agent/notification.pp b/manifests/profile/base/ceilometer/agent/notification.pp
index 83a0234..7fe8e81 100644
--- a/manifests/profile/base/ceilometer/agent/notification.pp
+++ b/manifests/profile/base/ceilometer/agent/notification.pp
@@ -23,11 +23,9 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
-
 class tripleo::profile::base::ceilometer::agent::notification (
   $step = hiera('step'),
 ) {
-
   include ::tripleo::profile::base::ceilometer
 
   if $step >= 4 {
diff --git a/manifests/profile/base/ceilometer/api.pp b/manifests/profile/base/ceilometer/api.pp
index e324c00..b300a91 100644
--- a/manifests/profile/base/ceilometer/api.pp
+++ b/manifests/profile/base/ceilometer/api.pp
@@ -23,11 +23,9 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
-
 class tripleo::profile::base::ceilometer::api (
   $step = hiera('step'),
 ) {
-
   include ::tripleo::profile::base::ceilometer
 
   if $step >= 4 {
diff --git a/manifests/profile/base/ceilometer/collector.pp b/manifests/profile/base/ceilometer/collector.pp
index b0a986f..a8ca88b 100644
--- a/manifests/profile/base/ceilometer/collector.pp
+++ b/manifests/profile/base/ceilometer/collector.pp
@@ -26,7 +26,7 @@
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
-
+#
 class tripleo::profile::base::ceilometer::collector (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
   $step           = hiera('step'),
diff --git a/manifests/profile/base/ceilometer/expirer.pp b/manifests/profile/base/ceilometer/expirer.pp
index 43d8c26..0830307 100644
--- a/manifests/profile/base/ceilometer/expirer.pp
+++ b/manifests/profile/base/ceilometer/expirer.pp
@@ -23,11 +23,9 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
-
 class tripleo::profile::base::ceilometer::expirer (
   $step = hiera('step'),
 ) {
-
   include ::tripleo::profile::base::ceilometer
 
   if $step >= 4 {
diff --git a/manifests/profile/base/ceph/client.pp b/manifests/profile/base/ceph/client.pp
index 851324a..53f09c2 100644
--- a/manifests/profile/base/ceph/client.pp
+++ b/manifests/profile/base/ceph/client.pp
@@ -26,7 +26,6 @@
 class tripleo::profile::base::ceph::client (
   $step = hiera('step'),
 ) {
-
   include ::tripleo::profile::base::ceph
 
   if $step >= 2 {
diff --git a/manifests/profile/base/ceph/mon.pp b/manifests/profile/base/ceph/mon.pp
index b211120..c0768b6 100644
--- a/manifests/profile/base/ceph/mon.pp
+++ b/manifests/profile/base/ceph/mon.pp
@@ -37,7 +37,6 @@ class tripleo::profile::base::ceph::mon (
   $ceph_pools = {},
   $step       = hiera('step'),
 ) {
-
   include ::tripleo::profile::base::ceph
 
   if $step >= 2 {
diff --git a/manifests/profile/base/ceph/osd.pp b/manifests/profile/base/ceph/osd.pp
index 9736656..6940bca 100644
--- a/manifests/profile/base/ceph/osd.pp
+++ b/manifests/profile/base/ceph/osd.pp
@@ -31,7 +31,6 @@ class tripleo::profile::base::ceph::osd (
   $ceph_osd_selinux_permissive = false,
   $step                        = hiera('step'),
 ) {
-
   include ::tripleo::profile::base::ceph
 
   if $step >= 3 {
diff --git a/manifests/profile/base/cinder.pp b/manifests/profile/base/cinder.pp
index 27dc277..8f252d4 100644
--- a/manifests/profile/base/cinder.pp
+++ b/manifests/profile/base/cinder.pp
@@ -37,7 +37,6 @@ class tripleo::profile::base::cinder (
   $pacemaker_master       = true,
   $step                   = hiera('step'),
 ) {
-
   if $step >= 4 or ($step >= 3 and $pacemaker_master) {
     include ::cinder
     include ::cinder::config
diff --git a/manifests/profile/base/cinder/api.pp b/manifests/profile/base/cinder/api.pp
index ad970f6..e15e112 100644
--- a/manifests/profile/base/cinder/api.pp
+++ b/manifests/profile/base/cinder/api.pp
@@ -26,7 +26,7 @@
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
-
+#
 class tripleo::profile::base::cinder::api (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
   $step           = hiera('step'),
diff --git a/manifests/profile/base/cinder/scheduler.pp b/manifests/profile/base/cinder/scheduler.pp
index 68f2813..4586929 100644
--- a/manifests/profile/base/cinder/scheduler.pp
+++ b/manifests/profile/base/cinder/scheduler.pp
@@ -26,7 +26,6 @@
 class tripleo::profile::base::cinder::scheduler (
   $step = hiera('step'),
 ) {
-
   include ::tripleo::profile::base::cinder
 
   if $step >= 4 {
diff --git a/manifests/profile/base/cinder/volume.pp b/manifests/profile/base/cinder/volume.pp
index 96cd06a..dfb034f 100644
--- a/manifests/profile/base/cinder/volume.pp
+++ b/manifests/profile/base/cinder/volume.pp
@@ -61,7 +61,6 @@ class tripleo::profile::base::cinder::volume (
   $cinder_user_enabled_backends = hiera('cinder_user_enabled_backends', undef),
   $step                         = hiera('step'),
 ) {
-
   include ::tripleo::profile::base::cinder
 
   if $step >= 4 {
diff --git a/manifests/profile/base/cinder/volume/dellsc.pp b/manifests/profile/base/cinder/volume/dellsc.pp
index 6f7922d..534bcb7 100644
--- a/manifests/profile/base/cinder/volume/dellsc.pp
+++ b/manifests/profile/base/cinder/volume/dellsc.pp
@@ -31,7 +31,6 @@ class tripleo::profile::base::cinder::volume::dellsc (
   $backend_name = hiera('cinder::backend::dellsc_iscsi::volume_backend_name', 'tripleo_dellsc'),
   $step         = hiera('step'),
 ) {
-
   include ::tripleo::profile::base::cinder::volume
 
   if $step >= 4 {
diff --git a/manifests/profile/base/cinder/volume/eqlx.pp b/manifests/profile/base/cinder/volume/eqlx.pp
index a18270d..2399459 100644
--- a/manifests/profile/base/cinder/volume/eqlx.pp
+++ b/manifests/profile/base/cinder/volume/eqlx.pp
@@ -31,7 +31,6 @@ class tripleo::profile::base::cinder::volume::eqlx (
   $backend_name = hiera('cinder::backend::eqlx::volume_backend_name', 'tripleo_eqlx'),
   $step         = hiera('step'),
 ) {
-
   include ::tripleo::profile::base::cinder::volume
 
   if $step >= 4 {
diff --git a/manifests/profile/base/cinder/volume/iscsi.pp b/manifests/profile/base/cinder/volume/iscsi.pp
index d857caa..d1d22bb 100644
--- a/manifests/profile/base/cinder/volume/iscsi.pp
+++ b/manifests/profile/base/cinder/volume/iscsi.pp
@@ -21,6 +21,10 @@
 # [*cinder_iscsi_address*]
 #   The address where to bind the iscsi targets daemon
 #
+# [*backend_name*]
+#   (Optional) Name given to the Cinder backend stanza
+#   Defaults to 'tripleo_iscsi'
+#
 # [*cinder_iscsi_helper*]
 #   (Optional) The iscsi helper to use
 #   Defaults to 'tgtadm'
@@ -29,10 +33,6 @@
 #   (Optional) The size (in MB) of the LVM loopback volume
 #   Defaults to '10280'
 #
-# [*backend_name*]
-#   (Optional) Name given to the Cinder backend stanza
-#   Defaults to 'tripleo_iscsi'
-#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
@@ -40,12 +40,11 @@
 #
 class tripleo::profile::base::cinder::volume::iscsi (
   $cinder_iscsi_address,
-  $cinder_iscsi_helper          = 'tgtadm',
-  $cinder_lvm_loop_device_size  = '10280',
-  $backend_name                 = hiera('cinder::backend::iscsi::volume_backend_name', 'tripleo_iscsi'),
-  $step                         = hiera('step'),
+  $backend_name                = hiera('cinder::backend::iscsi::volume_backend_name', 'tripleo_iscsi'),
+  $cinder_iscsi_helper         = 'tgtadm',
+  $cinder_lvm_loop_device_size = '10280',
+  $step                        = hiera('step'),
 ) {
-
   include ::tripleo::profile::base::cinder::volume
 
   if $step >= 4 {
diff --git a/manifests/profile/base/cinder/volume/netapp.pp b/manifests/profile/base/cinder/volume/netapp.pp
index bae541f..fc652c9 100644
--- a/manifests/profile/base/cinder/volume/netapp.pp
+++ b/manifests/profile/base/cinder/volume/netapp.pp
@@ -31,7 +31,6 @@ class tripleo::profile::base::cinder::volume::netapp (
   $backend_name = hiera('cinder::backend::netapp::volume_backend_name', 'tripleo_netapp'),
   $step         = hiera('step'),
 ) {
-
   include ::tripleo::profile::base::cinder::volume
 
   if $step >= 4 {
diff --git a/manifests/profile/base/cinder/volume/nfs.pp b/manifests/profile/base/cinder/volume/nfs.pp
index a26c50e..7b1f1b9 100644
--- a/manifests/profile/base/cinder/volume/nfs.pp
+++ b/manifests/profile/base/cinder/volume/nfs.pp
@@ -18,10 +18,6 @@
 #
 # === Parameters
 #
-# [*cinder_nfs_mount_options*]
-#   (Optional) List of mount options for the NFS share
-#   Defaults to ''
-#
 # [*cinder_nfs_servers*]
 #   List of NFS shares to mount
 #
@@ -29,18 +25,21 @@
 #   (Optional) Name given to the Cinder backend stanza
 #   Defaults to 'tripleo_nfs'
 #
+# [*cinder_nfs_mount_options*]
+#   (Optional) List of mount options for the NFS share
+#   Defaults to ''
+#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::cinder::volume::nfs (
-  $cinder_nfs_mount_options = '',
   $cinder_nfs_servers,
   $backend_name             = hiera('cinder::backend::nfs::volume_backend_name', 'tripleo_nfs'),
+  $cinder_nfs_mount_options = '',
   $step                     = hiera('step'),
 ) {
-
   include ::tripleo::profile::base::cinder::volume
 
   if $step >= 4 {
diff --git a/manifests/profile/base/cinder/volume/rbd.pp b/manifests/profile/base/cinder/volume/rbd.pp
index 6c8341a..1246de8 100644
--- a/manifests/profile/base/cinder/volume/rbd.pp
+++ b/manifests/profile/base/cinder/volume/rbd.pp
@@ -18,6 +18,10 @@
 #
 # === Parameters
 #
+# [*backend_name*]
+#   (Optional) Name given to the Cinder backend stanza
+#   Defaults to 'tripleo_ceph'
+#
 # [*cinder_rbd_backend_host*]
 #   (Optional) String to use as backend_host in the backend stanza
 #   Defaults to 'cinder::host'
@@ -34,24 +38,19 @@
 #   (Optional) The user name for the RBD client
 #   Defaults to 'openstack'
 #
-# [*backend_name*]
-#   (Optional) Name given to the Cinder backend stanza
-#   Defaults to 'tripleo_ceph'
-#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::cinder::volume::rbd (
+  $backend_name            = hiera('cinder::backend::rbd::volume_backend_name', 'tripleo_ceph'),
   $cinder_rbd_backend_host = hiera('cinder::host', 'hostgroup'),
   $cinder_rbd_pool_name    = 'volumes',
   $cinder_rbd_secret_uuid  = hiera('ceph::profile::params::fsid', undef),
   $cinder_rbd_user_name    = 'openstack',
-  $backend_name            = hiera('cinder::backend::rbd::volume_backend_name', 'tripleo_ceph'),
   $step                    = hiera('step'),
 ) {
-
   include ::tripleo::profile::base::cinder::volume
 
   if $step >= 4 {
diff --git a/manifests/profile/base/database/mongodb.pp b/manifests/profile/base/database/mongodb.pp
index 4c53c9c..1a19bb6 100644
--- a/manifests/profile/base/database/mongodb.pp
+++ b/manifests/profile/base/database/mongodb.pp
@@ -32,10 +32,9 @@
 #
 class tripleo::profile::base::database::mongodb (
   $mongodb_replset,
-  $bootstrap_node       = downcase(hiera('bootstrap_nodeid')),
-  $step                 = hiera('step'),
+  $bootstrap_node = downcase(hiera('bootstrap_nodeid')),
+  $step           = hiera('step'),
 ) {
-
   if $step >= 2 {
 
     include ::mongodb::globals
diff --git a/manifests/profile/base/database/mongodbcommon.pp b/manifests/profile/base/database/mongodbcommon.pp
index 6530730..756ab85 100644
--- a/manifests/profile/base/database/mongodbcommon.pp
+++ b/manifests/profile/base/database/mongodbcommon.pp
@@ -18,18 +18,17 @@
 #
 # === Parameters
 #
-# [*mongodb_node_ips*]
-#   List of The mongodb node ip addresses
-#
 # [*mongodb_ipv6_enabled*]
 #   A boolean value for mongodb server ipv6 is enabled or not
 #   Defaults to false
 #
+# [*mongodb_node_ips*]
+#   List of The mongodb node ip addresses
+#
 class tripleo::profile::base::database::mongodbcommon (
-  $mongodb_node_ips     = hiera('mongo_node_ips'),
   $mongodb_ipv6_enabled = false,
+  $mongodb_node_ips     = hiera('mongo_node_ips'),
 ) {
-
   $port = '27017'
 
   # NOTE(gfidente): the following vars are needed on all nodes so they
diff --git a/manifests/profile/base/database/mysql.pp b/manifests/profile/base/database/mysql.pp
index 27df6e4..49c9df3 100644
--- a/manifests/profile/base/database/mysql.pp
+++ b/manifests/profile/base/database/mysql.pp
@@ -18,29 +18,30 @@
 #
 # === Parameters
 #
-# [*step*]
-#   (Optional) The current step in deployment. See tripleo-heat-templates
-#   for more details.
-#   Defaults to hiera('step')
+# [*manage_resources*]
+#   (Optional) Whether or not manage root user, root my.cnf, and service.
+#   Defaults to true
 #
 # [*mysql_server_options*]
 #   (Optional) Extras options to deploy MySQL. Useful when deploying Galera cluster.
 #   Should be an hash.
 #   Defaults to {}
 #
-# [*manage_resources*]
-#   (Optional) Whether or not manage root user, root my.cnf, and service.
-#   Defaults to true
-#
 # [*remove_default_accounts*]
 #   (Optional) Whether or not remove default MySQL accounts.
 #   Defaults to true
 #
+# [*step*]
+#   (Optional) The current step in deployment. See tripleo-heat-templates
+#   for more details.
+#   Defaults to hiera('step')
+#
 class tripleo::profile::base::database::mysql (
-  $step                    = hiera('step'),
-  $mysql_server_options    = {},
   $manage_resources        = true,
+  $mysql_server_options    = {},
   $remove_default_accounts = true,
+  $step                    = hiera('step'),
+
 ) {
 
   validate_hash($mysql_server_options)
diff --git a/manifests/profile/base/database/redis.pp b/manifests/profile/base/database/redis.pp
index 3a5200c..14f6af4 100644
--- a/manifests/profile/base/database/redis.pp
+++ b/manifests/profile/base/database/redis.pp
@@ -18,26 +18,24 @@
 #
 # === Parameters
 #
-# [*redis_node_ips*]
-#   (Optional) List of Redis node ips
-#   Defaults to hiera('redis_node_ips')
-#
 # [*bootstrap_nodeid*]
 #   (Optional) Hostname of Redis master
 #   Defaults to hiera('bootstrap_nodeid')
 #
+# [*redis_node_ips*]
+#   (Optional) List of Redis node ips
+#   Defaults to hiera('redis_node_ips')
+#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
-
 class tripleo::profile::base::database::redis (
-  $redis_node_ips   = hiera('redis_node_ips'),
   $bootstrap_nodeid = hiera('bootstrap_nodeid'),
+  $redis_node_ips   = hiera('redis_node_ips'),
   $step             = hiera('step'),
 ) {
-
   if $step >= 2 {
     if $bootstrap_nodeid == $::hostname {
       $slaveof = undef
diff --git a/manifests/profile/base/glance/api.pp b/manifests/profile/base/glance/api.pp
index fd43732..845fd41 100644
--- a/manifests/profile/base/glance/api.pp
+++ b/manifests/profile/base/glance/api.pp
@@ -18,18 +18,18 @@
 #
 # === Parameters
 #
+# [*glance_backend*]
+#   (Optional) Glance backend(s) to use.
+#   Defaults to downcase(hiera('glance_backend', 'swift'))
+#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*glance_backend*]
-#   (Optional) Glance backend(s) to use.
-#   Defaults to downcase(hiera('glance_backend', 'swift'))
-#
 class tripleo::profile::base::glance::api (
-  $step           = hiera('step'),
   $glance_backend = downcase(hiera('glance_backend', 'swift')),
+  $step           = hiera('step'),
 ) {
 
   if $step >= 4 {
diff --git a/manifests/profile/base/glance/registry.pp b/manifests/profile/base/glance/registry.pp
index ce89d12..ac6796a 100644
--- a/manifests/profile/base/glance/registry.pp
+++ b/manifests/profile/base/glance/registry.pp
@@ -22,19 +22,19 @@
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
 #   Defaults to hiera('bootstrap_nodeid')
 #
+# [*glance_backend*]
+#   (Optional) Glance backend(s) to use.
+#   Defaults to downcase(hiera('glance_backend', 'swift'))
+#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*glance_backend*]
-#   (Optional) Glance backend(s) to use.
-#   Defaults to downcase(hiera('glance_backend', 'swift'))
-
 class tripleo::profile::base::glance::registry (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
-  $step           = hiera('step'),
   $glance_backend = downcase(hiera('glance_backend', 'swift')),
+  $step           = hiera('step'),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
diff --git a/manifests/profile/base/gnocchi.pp b/manifests/profile/base/gnocchi.pp
index ee903cb..6a470ca 100644
--- a/manifests/profile/base/gnocchi.pp
+++ b/manifests/profile/base/gnocchi.pp
@@ -23,11 +23,9 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
-
 class tripleo::profile::base::gnocchi (
   $step = hiera('step'),
 ) {
-
   if $step >= 3 {
     include ::gnocchi
     include ::gnocchi::config
diff --git a/manifests/profile/base/gnocchi/api.pp b/manifests/profile/base/gnocchi/api.pp
index 870a9bb..5e7e215 100644
--- a/manifests/profile/base/gnocchi/api.pp
+++ b/manifests/profile/base/gnocchi/api.pp
@@ -18,22 +18,22 @@
 #
 # === Parameters
 #
-# [*gnocchi_backend*]
-#   (Optional) Gnocchi backend string file, swift or rbd
-#   Defaults to swift
-#
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
 #   Defaults to hiera('bootstrap_nodeid')
 #
+# [*gnocchi_backend*]
+#   (Optional) Gnocchi backend string file, swift or rbd
+#   Defaults to swift
+#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
-
+#
 class tripleo::profile::base::gnocchi::api (
-  $gnocchi_backend = downcase(hiera('gnocchi_backend', 'swift')),
   $bootstrap_node  = hiera('bootstrap_nodeid', undef),
+  $gnocchi_backend = downcase(hiera('gnocchi_backend', 'swift')),
   $step            = hiera('step'),
 ) {
   if $::hostname == downcase($bootstrap_node) {
diff --git a/manifests/profile/base/gnocchi/metricd.pp b/manifests/profile/base/gnocchi/metricd.pp
index 29cf882..4d7eb89 100644
--- a/manifests/profile/base/gnocchi/metricd.pp
+++ b/manifests/profile/base/gnocchi/metricd.pp
@@ -23,11 +23,9 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
-
 class tripleo::profile::base::gnocchi::metricd (
   $step = hiera('step'),
 ) {
-
   include ::tripleo::profile::base::gnocchi
 
   if $step >= 4 {
diff --git a/manifests/profile/base/gnocchi/statsd.pp b/manifests/profile/base/gnocchi/statsd.pp
index 830a128..775b043 100644
--- a/manifests/profile/base/gnocchi/statsd.pp
+++ b/manifests/profile/base/gnocchi/statsd.pp
@@ -23,11 +23,9 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
-
 class tripleo::profile::base::gnocchi::statsd (
   $step = hiera('step'),
 ) {
-
   include ::tripleo::profile::base::gnocchi
 
   if $step >= 4 {
diff --git a/manifests/profile/base/haproxy.pp b/manifests/profile/base/haproxy.pp
index 7951941..4f2f850 100644
--- a/manifests/profile/base/haproxy.pp
+++ b/manifests/profile/base/haproxy.pp
@@ -18,27 +18,6 @@
 #
 # === Parameters
 #
-# [*step*]
-#   (Optional) The current step in deployment. See tripleo-heat-templates
-#   for more details.
-#   Defaults to hiera('step')
-#
-# [*enable_load_balancer*]
-#   (Optional) Whether or not loadbalancer is enabled.
-#   Defaults to hiera('enable_load_balancer', true).
-#
-# [*generate_service_certificates*]
-#   (Optional) Whether or not certmonger will generate certificates for
-#   HAProxy. This could be as many as specified by the $certificates_specs
-#   variable.
-#   Note that this doesn't configure the certificates in haproxy, it merely
-#   creates the certificates.
-#   Defaults to hiera('generate_service_certificate', false).
-#
-# [*certmonger_ca*]
-#   (Optional) The CA that certmonger will use to generate the certificates.
-#   Defaults to hiera('certmonger_ca', 'local').
-#
 # [*certificates_specs*]
 #   (Optional) The specifications to give to certmonger for the certificate(s)
 #   it will create.
@@ -53,14 +32,34 @@
 #         principal: "haproxy/<undercloud fqdn>"
 #   Defaults to {}.
 #
+# [*certmonger_ca*]
+#   (Optional) The CA that certmonger will use to generate the certificates.
+#   Defaults to hiera('certmonger_ca', 'local').
+#
+# [*enable_load_balancer*]
+#   (Optional) Whether or not loadbalancer is enabled.
+#   Defaults to hiera('enable_load_balancer', true).
+#
+# [*generate_service_certificates*]
+#   (Optional) Whether or not certmonger will generate certificates for
+#   HAProxy. This could be as many as specified by the $certificates_specs
+#   variable.
+#   Note that this doesn't configure the certificates in haproxy, it merely
+#   creates the certificates.
+#   Defaults to hiera('generate_service_certificate', false).
+#
+# [*step*]
+#   (Optional) The current step in deployment. See tripleo-heat-templates
+#   for more details.
+#   Defaults to hiera('step')
+#
 class tripleo::profile::base::haproxy (
+  $certificates_specs            = {},
+  $certmonger_ca                 = hiera('certmonger_ca', 'local'),
   $enable_load_balancer          = hiera('enable_load_balancer', true),
-  $step                          = hiera('step'),
   $generate_service_certificates = hiera('generate_service_certificates', false),
-  $certmonger_ca                 = hiera('certmonger_ca', 'local'),
-  $certificates_specs            = {},
+  $step                          = hiera('step'),
 ) {
-
   if $step >= 1 {
     if $enable_load_balancer {
       if str2bool($generate_service_certificates) {
diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp
index 1311f20..8512d6e 100644
--- a/manifests/profile/base/heat.pp
+++ b/manifests/profile/base/heat.pp
@@ -18,15 +18,6 @@
 #
 # === Parameters
 #
-# [*step*]
-#   (Optional) The current step in deployment. See tripleo-heat-templates
-#   for more details.
-#   Defaults to hiera('step')
-#
-# [*notification_driver*]
-#   (Optional) Heat notification driver to use.
-#   Defaults to 'messaging'
-#
 # [*bootstrap_master*]
 #   (Optional) The hostname of the node responsible for bootstrapping
 #   Defaults to downcase(hiera('bootstrap_nodeid'))
@@ -35,13 +26,21 @@
 #   (Optional) Whether keystone token flushing should be enabled
 #   Defaults to hiera('keystone_enable_db_purge', true)
 #
+# [*notification_driver*]
+#   (Optional) Heat notification driver to use.
+#   Defaults to 'messaging'
+#
+# [*step*]
+#   (Optional) The current step in deployment. See tripleo-heat-templates
+#   for more details.
+#   Defaults to hiera('step')
+#
 class tripleo::profile::base::heat (
-  $step = hiera('step'),
+  $bootstrap_master    = downcase(hiera('bootstrap_nodeid')),
+  $manage_db_purge     = hiera('heat_enable_db_purge', true),
   $notification_driver = 'messaging',
-  $bootstrap_master = downcase(hiera('bootstrap_nodeid')),
-  $manage_db_purge = hiera('heat_enable_db_purge', true),
+  $step                = hiera('step'),
 ) {
-
   # Domain resources will be created at step5 on the pacemaker_master so we
   # configure heat.conf at step3 and 4 but actually create the domain later.
   if $step == 3 or $step == 4 {
diff --git a/manifests/profile/base/heat/api.pp b/manifests/profile/base/heat/api.pp
index 67a0bfc..68de12b 100644
--- a/manifests/profile/base/heat/api.pp
+++ b/manifests/profile/base/heat/api.pp
@@ -24,9 +24,8 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::heat::api (
-  $step           = hiera('step'),
+  $step = hiera('step'),
 ) {
-
   if $step >= 4 {
     include ::tripleo::profile::base::heat
     include ::heat::api
diff --git a/manifests/profile/base/heat/api_cfn.pp b/manifests/profile/base/heat/api_cfn.pp
index 2813826..7c80fc6 100644
--- a/manifests/profile/base/heat/api_cfn.pp
+++ b/manifests/profile/base/heat/api_cfn.pp
@@ -24,9 +24,8 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::heat::api_cfn (
-  $step           = hiera('step'),
+  $step = hiera('step'),
 ) {
-
   if $step >= 4 {
     include ::tripleo::profile::base::heat
     include ::heat::api_cfn
diff --git a/manifests/profile/base/heat/api_cloudwatch.pp b/manifests/profile/base/heat/api_cloudwatch.pp
index b2adf92..6362275 100644
--- a/manifests/profile/base/heat/api_cloudwatch.pp
+++ b/manifests/profile/base/heat/api_cloudwatch.pp
@@ -24,9 +24,8 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::heat::api_cloudwatch (
-  $step           = hiera('step'),
+  $step = hiera('step'),
 ) {
-
   if $step >= 4 {
     include ::tripleo::profile::base::heat
     include ::heat::api_cloudwatch
diff --git a/manifests/profile/base/heat/engine.pp b/manifests/profile/base/heat/engine.pp
index 1fd627f..32a711f 100644
--- a/manifests/profile/base/heat/engine.pp
+++ b/manifests/profile/base/heat/engine.pp
@@ -26,7 +26,7 @@
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
-
+#
 class tripleo::profile::base::heat::engine (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
   $step           = hiera('step'),
diff --git a/manifests/profile/base/ironic.pp b/manifests/profile/base/ironic.pp
index ca4f366..f098d37 100644
--- a/manifests/profile/base/ironic.pp
+++ b/manifests/profile/base/ironic.pp
@@ -25,7 +25,7 @@
 # [*step*]
 #   (Optional) The current step of the deployment
 #   Defaults to hiera('step')
-
+#
 class tripleo::profile::base::ironic (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
   $step           = hiera('step'),
diff --git a/manifests/profile/base/ironic/api.pp b/manifests/profile/base/ironic/api.pp
index 1406e2d..020cacb 100644
--- a/manifests/profile/base/ironic/api.pp
+++ b/manifests/profile/base/ironic/api.pp
@@ -23,10 +23,10 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::ironic::api (
-  $step    = hiera('step'),
+  $step = hiera('step'),
 ) {
-
   include ::tripleo::profile::base::ironic
+
   if $step >= 4 {
       include ::ironic::api
   }
diff --git a/manifests/profile/base/ironic/conductor.pp b/manifests/profile/base/ironic/conductor.pp
index 7a587a5..2cb61fb 100644
--- a/manifests/profile/base/ironic/conductor.pp
+++ b/manifests/profile/base/ironic/conductor.pp
@@ -23,9 +23,8 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::ironic::conductor (
-  $step    = hiera('step'),
+  $step = hiera('step'),
 ) {
-
   include ::tripleo::profile::base::ironic
 
   if $step >= 4 {
diff --git a/manifests/profile/base/keepalived.pp b/manifests/profile/base/keepalived.pp
index af7c095..f2063d6 100644
--- a/manifests/profile/base/keepalived.pp
+++ b/manifests/profile/base/keepalived.pp
@@ -18,25 +18,23 @@
 #
 # === Parameters
 #
+# [*enable_load_balancer*]
+#   (Optional) Whether or not loadbalancer is enabled.
+#   Defaults to hiera('enable_load_balancer', true).
+#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*enable_load_balancer*]
-#   (Optional) Whether or not loadbalancer is enabled.
-#   Defaults to hiera('enable_load_balancer', true).
-#
 class tripleo::profile::base::keepalived (
   $enable_load_balancer = hiera('enable_load_balancer', true),
   $step                 = hiera('step'),
 ) {
-
   if $step >= 1 {
     if $enable_load_balancer and hiera('enable_keepalived', true){
       include ::tripleo::keepalived
     }
   }
-
 }
 
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index bba98f8..d8c8e24 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -18,22 +18,22 @@
 #
 # === Parameters
 #
-# [*manage_db_purge*]
-#   (Optional) Whether keystone token flushing should be enabled
-#   Defaults to hiera('keystone_enable_db_purge', true)
-#
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
 #   Defaults to hiera('bootstrap_nodeid')
 #
+# [*manage_db_purge*]
+#   (Optional) Whether keystone token flushing should be enabled
+#   Defaults to hiera('keystone_enable_db_purge', true)
+#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
-
+#
 class tripleo::profile::base::keystone (
-  $manage_db_purge = hiera('keystone_enable_db_purge', true),
   $bootstrap_node  = hiera('bootstrap_nodeid', undef),
+  $manage_db_purge = hiera('keystone_enable_db_purge', true),
   $step            = hiera('step'),
 ) {
   if $::hostname == downcase($bootstrap_node) {
diff --git a/manifests/profile/base/manila/api.pp b/manifests/profile/base/manila/api.pp
index c1188ec..9a3a314 100644
--- a/manifests/profile/base/manila/api.pp
+++ b/manifests/profile/base/manila/api.pp
@@ -24,9 +24,8 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::manila::api (
-  $step           = hiera('step'),
+  $step = hiera('step'),
 ) {
-
   if $step >= 4 {
     include ::manila
     include ::manila::api
diff --git a/manifests/profile/base/manila/scheduler.pp b/manifests/profile/base/manila/scheduler.pp
index 3d39c4a..8581187 100644
--- a/manifests/profile/base/manila/scheduler.pp
+++ b/manifests/profile/base/manila/scheduler.pp
@@ -26,7 +26,7 @@
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
-
+#
 class tripleo::profile::base::manila::scheduler (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
   $step           = hiera('step'),
diff --git a/manifests/profile/base/manila/share.pp b/manifests/profile/base/manila/share.pp
index 932e013..ed64b29 100644
--- a/manifests/profile/base/manila/share.pp
+++ b/manifests/profile/base/manila/share.pp
@@ -24,12 +24,10 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::manila::share (
-  $step           = hiera('step'),
+  $step = hiera('step'),
 ) {
-
   if $step >= 4 {
     include ::manila::share
   }
-
 }
 
diff --git a/manifests/profile/base/memcached.pp b/manifests/profile/base/memcached.pp
index 54d12c8..72a91e2 100644
--- a/manifests/profile/base/memcached.pp
+++ b/manifests/profile/base/memcached.pp
@@ -23,11 +23,9 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
-#
 class tripleo::profile::base::memcached (
-  $step             = hiera('step'),
+  $step = hiera('step'),
 ) {
-
   if $step >= 1 {
       include ::memcached
   }
diff --git a/manifests/profile/base/mistral.pp b/manifests/profile/base/mistral.pp
index c0b0538..febbae6 100644
--- a/manifests/profile/base/mistral.pp
+++ b/manifests/profile/base/mistral.pp
@@ -18,20 +18,19 @@
 #
 # === Parameters
 #
+# [*bootstrap_node*]
+#   (Optional) The hostname of the node responsible for bootstrapping tasks
+#   Defaults to hiera('bootstrap_nodeid')
+#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*bootstrap_node*]
-#   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
-#
 class tripleo::profile::base::mistral (
-  $step           = hiera('step'),
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
+  $step           = hiera('step'),
 ) {
-
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
   } else {
diff --git a/manifests/profile/base/mistral/api.pp b/manifests/profile/base/mistral/api.pp
index 38e1e61..aeff788 100644
--- a/manifests/profile/base/mistral/api.pp
+++ b/manifests/profile/base/mistral/api.pp
@@ -18,20 +18,19 @@
 #
 # === Parameters
 #
+# [*bootstrap_node*]
+#   (Optional) The hostname of the node responsible for bootstrapping tasks
+#   Defaults to hiera('bootstrap_nodeid')
+#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*bootstrap_node*]
-#   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
-#
 class tripleo::profile::base::mistral::api (
-  $step           = hiera('step'),
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
+  $step           = hiera('step'),
 ) {
-
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
   } else {
diff --git a/manifests/profile/base/mistral/engine.pp b/manifests/profile/base/mistral/engine.pp
index dfcbc2c..cf82237 100644
--- a/manifests/profile/base/mistral/engine.pp
+++ b/manifests/profile/base/mistral/engine.pp
@@ -18,20 +18,19 @@
 #
 # === Parameters
 #
+# [*bootstrap_node*]
+#   (Optional) The hostname of the node responsible for bootstrapping tasks
+#   Defaults to hiera('bootstrap_nodeid')
+#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*bootstrap_node*]
-#   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
-#
 class tripleo::profile::base::mistral::engine (
-  $step           = hiera('step'),
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
+  $step           = hiera('step'),
 ) {
-
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
   } else {
diff --git a/manifests/profile/base/mistral/executor.pp b/manifests/profile/base/mistral/executor.pp
index 6f101c8..dd8c642 100644
--- a/manifests/profile/base/mistral/executor.pp
+++ b/manifests/profile/base/mistral/executor.pp
@@ -18,21 +18,19 @@
 #
 # === Parameters
 #
+# [*bootstrap_node*]
+#   (Optional) The hostname of the node responsible for bootstrapping tasks
+#   Defaults to hiera('bootstrap_nodeid')
+#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*bootstrap_node*]
-#   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
-#
 class tripleo::profile::base::mistral::executor (
-  $step           = hiera('step'),
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
-
+  $step           = hiera('step'),
 ) {
-
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
   } else {
@@ -44,5 +42,4 @@ class tripleo::profile::base::mistral::executor (
   if $step >= 4 and $sync_db {
     include ::mistral::executor
   }
-
 }
diff --git a/manifests/profile/base/monitoring/fluentd.pp b/manifests/profile/base/monitoring/fluentd.pp
index 1ea7d39..8160452 100644
--- a/manifests/profile/base/monitoring/fluentd.pp
+++ b/manifests/profile/base/monitoring/fluentd.pp
@@ -25,7 +25,6 @@
 class tripleo::profile::base::monitoring::fluentd (
   $step = hiera('step', undef)
 ) {
-
   if $step == undef or $step >= 3 {
     include ::fluentd
 
diff --git a/manifests/profile/base/monitoring/rabbitmq.pp b/manifests/profile/base/monitoring/rabbitmq.pp
index 4c5ad41..cfd5016 100644
--- a/manifests/profile/base/monitoring/rabbitmq.pp
+++ b/manifests/profile/base/monitoring/rabbitmq.pp
@@ -18,22 +18,22 @@
 #
 # === Parameters
 #
-# [*vhost*]
-#   (Optional) String. RabbitMQ vhost to be used by Sensu
-#   Defaults to '/sensu'
+# [*password*]
+#   (Optional) String. Password to connect to RabbitMQ server
+#   Defaults to hiera('rabbit_password', undef)
 #
 # [*user*]
 #   (Optional) String. Username to connect to RabbitMQ server
 #   Defaults to hiera('rabbit_username', 'sensu')
 #
-# [*password*]
-#   (Optional) String. Password to connect to RabbitMQ server
-#   Defaults to hiera('rabbit_password', undef)
+# [*vhost*]
+#   (Optional) String. RabbitMQ vhost to be used by Sensu
+#   Defaults to '/sensu'
 #
 class tripleo::profile::base::monitoring::rabbitmq (
-  $vhost    = hiera('monitoring_rabbitmq_vhost', '/sensu'),
-  $user     = hiera('monitoring_rabbitmq_username', 'sensu'),
   $password = hiera('monitoring_rabbitmq_password', undef),
+  $user     = hiera('monitoring_rabbitmq_username', 'sensu'),
+  $vhost    = hiera('monitoring_rabbitmq_vhost', '/sensu'),
 ) {
   rabbitmq_vhost { 'sensu-rabbit-vhost':
     ensure => present,
diff --git a/manifests/profile/base/monitoring/sensu.pp b/manifests/profile/base/monitoring/sensu.pp
index af09059..a6872b3 100644
--- a/manifests/profile/base/monitoring/sensu.pp
+++ b/manifests/profile/base/monitoring/sensu.pp
@@ -25,10 +25,8 @@
 class tripleo::profile::base::monitoring::sensu (
   $step = hiera('step', undef),
 ) {
-
   if $step == undef or $step >= 3 {
     include ::sensu
-
     package { 'osops-tools-monitoring-oschecks':
       ensure => 'present'
     }
diff --git a/manifests/profile/base/monitoring/uchiwa.pp b/manifests/profile/base/monitoring/uchiwa.pp
index 7c61f3e..2674b5f 100644
--- a/manifests/profile/base/monitoring/uchiwa.pp
+++ b/manifests/profile/base/monitoring/uchiwa.pp
@@ -25,7 +25,6 @@
 class tripleo::profile::base::monitoring::uchiwa (
   $step = hiera('step', undef),
 ) {
-
   if $step == undef or $step >= 3 {
     include ::uchiwa
   }
diff --git a/manifests/profile/base/neutron/agents/midonet.pp b/manifests/profile/base/neutron/agents/midonet.pp
index 52cafa9..f2ce94a 100644
--- a/manifests/profile/base/neutron/agents/midonet.pp
+++ b/manifests/profile/base/neutron/agents/midonet.pp
@@ -18,26 +18,24 @@
 #
 # === Parameters
 #
-# [*neutron_api_node_ips*]
-#   (Optional) The IPs of the Neutron API hosts
-#   Defaults to hiera('neutron_api_node_ips')
-#
 # [*midonet_libvirt_qemu_data*]
 #   (Optional) qemu.conf data for midonet.
 #   Defaults to hiera('midonet_libvirt_qemu_data')
 #
+# [*neutron_api_node_ips*]
+#   (Optional) The IPs of the Neutron API hosts
+#   Defaults to hiera('neutron_api_node_ips')
+#
 # [*step*]
 #   (Optional) The current step of the deployment
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::agents::midonet (
-  $neutron_api_node_ips       = hiera('neutron_api_node_ips', ''),
-  $midonet_libvirt_qemu_data  = hiera('midonet_libvirt_qemu_data', ''),
-  $step                       = hiera('step'),
+  $midonet_libvirt_qemu_data = hiera('midonet_libvirt_qemu_data', ''),
+  $neutron_api_node_ips      = hiera('neutron_api_node_ips', ''),
+  $step                      = hiera('step'),
 ) {
-
   if $step >= 4 {
-
     # TODO(devvesa) provide non-controller ips for these services
     class { '::tripleo::network::midonet::agent':
       zookeeper_servers => $neutron_api_node_ips,
@@ -50,7 +48,5 @@ class tripleo::profile::base::neutron::agents::midonet (
         content => hiera('midonet_libvirt_qemu_data')
       }
     }
-
   }
-
 }
diff --git a/manifests/profile/base/neutron/agents/nuage.pp b/manifests/profile/base/neutron/agents/nuage.pp
index c50feb2..80beceb 100644
--- a/manifests/profile/base/neutron/agents/nuage.pp
+++ b/manifests/profile/base/neutron/agents/nuage.pp
@@ -18,36 +18,34 @@
 #
 # === Parameters
 #
-# [*nova_os_tenant_name*]
-#   (Optional) Nova tenant name
-#   Defaults to hiera('nova_os_tenant_name')
-#
-# [*nova_os_password*]
-#   (Optional) Nova password
-#   Defaults to hiera('nova_password')
+# [*nova_auth_ip*]
+#   (Optional) Nova auth IP
+#   Defaults to hiera('keystone_public_api_virtual_ip')
 #
 # [*nova_metadata_ip*]
 #   (Optional) Nova metadata node IPs
 #   Defaults to hiera('nova_metadata_node_ips')
 #
-# [*nova_auth_ip*]
-#   (Optional) Nova auth IP
-#   Defaults to hiera('keystone_public_api_virtual_ip')
+# [*nova_os_password*]
+#   (Optional) Nova password
+#   Defaults to hiera('nova_password')
+#
+# [*nova_os_tenant_name*]
+#   (Optional) Nova tenant name
+#   Defaults to hiera('nova_os_tenant_name')
 #
 # [*step*]
 #   (Optional) The current step of the deployment
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::agents::nuage (
-  $nova_os_tenant_name       = hiera('nova::api::admin_tenant_name', ''),
-  $nova_os_password          = hiera('nova_password', ''),
-  $nova_metadata_ip          = hiera('nova_metadata_node_ips', ''),
-  $nova_auth_ip              = hiera('keystone_public_api_virtual_ip', ''),
-  $step                      = hiera('step'),
+  $nova_auth_ip        = hiera('keystone_public_api_virtual_ip', ''),
+  $nova_metadata_ip    = hiera('nova_metadata_node_ips', ''),
+  $nova_os_password    = hiera('nova_password', ''),
+  $nova_os_tenant_name = hiera('nova::api::admin_tenant_name', ''),
+  $step                = hiera('step'),
 ) {
-
   if $step >= 4 {
-
     include ::nuage::vrs
 
     class { '::nuage::metadataagent':
@@ -56,7 +54,5 @@ class tripleo::profile::base::neutron::agents::nuage (
       nova_metadata_ip    => $nova_metadata_ip,
       nova_auth_ip        => $nova_auth_ip,
     }
-
   }
-
 }
diff --git a/manifests/profile/base/neutron/dhcp.pp b/manifests/profile/base/neutron/dhcp.pp
index a313478..24b1a35 100644
--- a/manifests/profile/base/neutron/dhcp.pp
+++ b/manifests/profile/base/neutron/dhcp.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::dhcp (
-  $step                    = hiera('step'),
+  $step = hiera('step'),
 ) {
   if $step >= 4 {
     include ::tripleo::profile::base::neutron
diff --git a/manifests/profile/base/neutron/l3.pp b/manifests/profile/base/neutron/l3.pp
index 2b57555..14ffa82 100644
--- a/manifests/profile/base/neutron/l3.pp
+++ b/manifests/profile/base/neutron/l3.pp
@@ -18,17 +18,13 @@
 #
 # === Parameters
 #
-# [*neutron_ovs_use_veth*]
-#   (Optional) Whether to set ovs_use_veth (for older kernel support)
-#   Defaults to hiera('neutron_ovs_use_veth', false)
-#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::l3 (
-  $step           = hiera('step'),
+  $step = hiera('step'),
 ) {
   if $step >= 4 {
     include ::tripleo::profile::base::neutron
diff --git a/manifests/profile/base/neutron/metadata.pp b/manifests/profile/base/neutron/metadata.pp
index d7b4c99..4cc6748 100644
--- a/manifests/profile/base/neutron/metadata.pp
+++ b/manifests/profile/base/neutron/metadata.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::metadata (
-  $step           = hiera('step'),
+  $step = hiera('step'),
 ) {
   if $step >= 4 {
     include ::tripleo::profile::base::neutron
diff --git a/manifests/profile/base/neutron/midonet.pp b/manifests/profile/base/neutron/midonet.pp
index 3276b82..c8f3044 100644
--- a/manifests/profile/base/neutron/midonet.pp
+++ b/manifests/profile/base/neutron/midonet.pp
@@ -18,69 +18,63 @@
 #
 # === Parameters
 #
-# [*vip*]
-#   (Optional) Public Virtual IP Address for this cloud
-#   Defaults to hiera('public_virtual_ip')
+# [*admin_password*]
+#   (Optional) Admin Password for Midonet API
+#   Defaults to hiera('admin_password')
+#
+# [*bind_address*]
+#   (Optional) The address to bind Cassandra and Midonet API to
+#   Defaults to hiera('neutron::bind_host')
 #
 # [*keystone_admin_token*]
 #   (Optional) The Keystone Admin Token
 #   Defaults to hiera('keystone::admin_token')
 #
-# [*zookeeper_client_ip*]
-#   (Optional) The IP of the Zookeeper Client
-#   Defaults to hiera('neutron::bind_host')
-#
-# [*zookeeper_hostnames*]
-#   (Optional) The IPs of the Zookeeper Servers
-#   Defaults to hiera('controller_node_names')
-#
 # [*neutron_api_node_ips*]
 #   (Optional) The IPs of the Neutron API hosts
 #   Defaults to hiera('neutron_api_node_ips')
 #
-# [*bind_address*]
-#   (Optional) The address to bind Cassandra and Midonet API to
-#   Defaults to hiera('neutron::bind_host')
-#
-# [*admin_password*]
-#   (Optional) Admin Password for Midonet API
-#   Defaults to hiera('admin_password')
-#
-# [*zk_on_controller*]
-#   (Optional) Whether to put zookeeper on the controllers
-#   Defaults to hiera('enable_zookeeper_on_controller')
-#
-# [*neutron_auth_tenant*]
-#   (Optional) Tenant to use for Neutron authentication
-#   Defaults to hiera('neutron::server::auth_tenant')
-#
 # [*neutron_auth_password*]
 #   (Optional) Password to use for Neutron authentication
 #   Defaults to hiera('neutron::server::auth_password')
 #
-# [*step*]
-#   (Optional) The current step in deployment. See tripleo-heat-templates
-#   for more details.
-#   Defaults to hiera('step')
+# [*neutron_auth_tenant*]
+#   (Optional) Tenant to use for Neutron authentication
+#   Defaults to hiera('neutron::server::auth_tenant')
 #
 # [*step*]
 #   (Optional) The current step of the deployment
 #   Defaults to hiera('step')
 #
+# [*vip*]
+#   (Optional) Public Virtual IP Address for this cloud
+#   Defaults to hiera('public_virtual_ip')
+#
+# [*zk_on_controller*]
+#   (Optional) Whether to put zookeeper on the controllers
+#   Defaults to hiera('enable_zookeeper_on_controller')
+#
+# [*zookeeper_client_ip*]
+#   (Optional) The IP of the Zookeeper Client
+#   Defaults to hiera('neutron::bind_host')
+#
+# [*zookeeper_hostnames*]
+#   (Optional) The IPs of the Zookeeper Servers
+#   Defaults to hiera('controller_node_names')
+#
 class tripleo::profile::base::neutron::midonet (
-  $vip                   = hiera('public_virtual_ip'),
+  $admin_password        = hiera('admin_password', ''),
+  $bind_address          = hiera('neutron::bind_host', ''),
   $keystone_admin_token  = hiera('keystone::admin_token', ''),
-  $zookeeper_client_ip   = hiera('neutron::bind_host', ''),
-  $zookeeper_hostnames   = hiera('controller_node_names', ''),
   $neutron_api_node_ips  = hiera('neutron_api_node_ips', ''),
-  $bind_address          = hiera('neutron::bind_host', ''),
-  $admin_password        = hiera('admin_password', ''),
-  $zk_on_controller      = hiera('enable_zookeeper_on_controller', ''),
-  $neutron_auth_tenant   = hiera('neutron::server::auth_tenant', ''),
   $neutron_auth_password = hiera('neutron::server::auth_password', ''),
+  $neutron_auth_tenant   = hiera('neutron::server::auth_tenant', ''),
   $step                  = hiera('step'),
+  $vip                   = hiera('public_virtual_ip'),
+  $zk_on_controller      = hiera('enable_zookeeper_on_controller', ''),
+  $zookeeper_client_ip   = hiera('neutron::bind_host', ''),
+  $zookeeper_hostnames   = hiera('controller_node_names', ''),
 ) {
-
   include ::tripleo::profile::base::neutron
   include ::tripleo::profile::base::neutron::agents::midonet
 
diff --git a/manifests/profile/base/neutron/ovs.pp b/manifests/profile/base/neutron/ovs.pp
index f801511..a4e0cd3 100644
--- a/manifests/profile/base/neutron/ovs.pp
+++ b/manifests/profile/base/neutron/ovs.pp
@@ -26,7 +26,6 @@
 class tripleo::profile::base::neutron::ovs(
   $step           = hiera('step'),
 ) {
-
   include ::tripleo::profile::base::neutron
 
   if $step >= 4 {
diff --git a/manifests/profile/base/neutron/plugins/ml2.pp b/manifests/profile/base/neutron/plugins/ml2.pp
index 0193615..c89bc02 100644
--- a/manifests/profile/base/neutron/plugins/ml2.pp
+++ b/manifests/profile/base/neutron/plugins/ml2.pp
@@ -18,23 +18,23 @@
 #
 # === Parameters
 #
-# [*mechanism_drivers*]
-#   (Optional) The mechanism drivers to use with the Ml2 plugin
-#   Defaults to hiera('neutron::plugins::ml2::mechanism_drivers')
-#
 # [*bootstrap_node*]
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
 #   Defaults to hiera('bootstrap_nodeid')
 #
+# [*mechanism_drivers*]
+#   (Optional) The mechanism drivers to use with the Ml2 plugin
+#   Defaults to hiera('neutron::plugins::ml2::mechanism_drivers')
+#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
-
+#
 class tripleo::profile::base::neutron::plugins::ml2 (
-  $mechanism_drivers  = hiera('neutron::plugins::ml2::mechanism_drivers'),
-  $bootstrap_node     = hiera('bootstrap_nodeid', undef),
-  $step               = hiera('step'),
+  $bootstrap_node    = hiera('bootstrap_nodeid', undef),
+  $mechanism_drivers = hiera('neutron::plugins::ml2::mechanism_drivers'),
+  $step              = hiera('step'),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
diff --git a/manifests/profile/base/neutron/plugins/nuage.pp b/manifests/profile/base/neutron/plugins/nuage.pp
index 4ada340..0843ec4 100644
--- a/manifests/profile/base/neutron/plugins/nuage.pp
+++ b/manifests/profile/base/neutron/plugins/nuage.pp
@@ -24,7 +24,7 @@
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
-
+#
 class tripleo::profile::base::neutron::plugins::nuage (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
   $step           = hiera('step'),
diff --git a/manifests/profile/base/neutron/plugins/opencontrail.pp b/manifests/profile/base/neutron/plugins/opencontrail.pp
index 6cd710a..fbf46e7 100644
--- a/manifests/profile/base/neutron/plugins/opencontrail.pp
+++ b/manifests/profile/base/neutron/plugins/opencontrail.pp
@@ -24,7 +24,7 @@
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
-
+#
 class tripleo::profile::base::neutron::plugins::opencontrail (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
   $step           = hiera('step'),
diff --git a/manifests/profile/base/neutron/plugins/plumgrid.pp b/manifests/profile/base/neutron/plugins/plumgrid.pp
index efd75ac..bc73d29 100644
--- a/manifests/profile/base/neutron/plugins/plumgrid.pp
+++ b/manifests/profile/base/neutron/plugins/plumgrid.pp
@@ -26,7 +26,7 @@
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
-
+#
 class tripleo::profile::base::neutron::plugins::plumgrid (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
   $step           = hiera('step'),
diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp
index 877184d..07c3be1 100644
--- a/manifests/profile/base/nova.pp
+++ b/manifests/profile/base/nova.pp
@@ -22,28 +22,28 @@
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
 #   Defaults to hiera('bootstrap_nodeid')
 #
-# [*step*]
-#   (Optional) The current step of the deployment
-#   Defaults to hiera('step')
+# [*libvirt_enabled*]
+#   (Optional) Whether or not Libvirt is enabled.
+#   Defaults to false
 #
 # [*manage_migration*]
 #   (Optional) Whether or not manage Nova Live migration
 #   Defaults to false
 #
-# [*libvirt_enabled*]
-#   (Optional) Whether or not Libvirt is enabled.
-#   Defaults to false
-#
 # [*nova_compute_enabled*]
 #   (Optional) Whether or not nova-compute is enabled.
 #   Defaults to false
 #
+# [*step*]
+#   (Optional) The current step of the deployment
+#   Defaults to hiera('step')
+#
 class tripleo::profile::base::nova (
   $bootstrap_node       = hiera('bootstrap_nodeid', undef),
-  $step                 = hiera('step'),
-  $manage_migration     = false,
   $libvirt_enabled      = false,
+  $manage_migration     = false,
   $nova_compute_enabled = false,
+  $step                 = hiera('step'),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
diff --git a/manifests/profile/base/nova/compute/ironic.pp b/manifests/profile/base/nova/compute/ironic.pp
index a01e90f..c0213fb 100644
--- a/manifests/profile/base/nova/compute/ironic.pp
+++ b/manifests/profile/base/nova/compute/ironic.pp
@@ -26,11 +26,9 @@
 class tripleo::profile::base::nova::compute::ironic (
   $step = hiera('step'),
 ) {
-
   if $step >= 4 {
     include ::tripleo::profile::base::nova::compute
     include ::nova::compute::ironic
     include ::nova::network::neutron
   }
-
 }
diff --git a/manifests/profile/base/nova/compute/libvirt.pp b/manifests/profile/base/nova/compute/libvirt.pp
index 5b6f895..956f8ad 100644
--- a/manifests/profile/base/nova/compute/libvirt.pp
+++ b/manifests/profile/base/nova/compute/libvirt.pp
@@ -26,7 +26,6 @@
 class tripleo::profile::base::nova::compute::libvirt (
   $step = hiera('step'),
 ) {
-
   if $step >= 4 {
     include ::tripleo::profile::base::nova::compute
 
diff --git a/manifests/profile/base/nova/conductor.pp b/manifests/profile/base/nova/conductor.pp
index 04c9d06..fa9f12b 100644
--- a/manifests/profile/base/nova/conductor.pp
+++ b/manifests/profile/base/nova/conductor.pp
@@ -26,10 +26,8 @@
 class tripleo::profile::base::nova::conductor (
   $step = hiera('step'),
 ) {
-
   include ::tripleo::profile::base::nova
   if $step >= 4 {
     include ::nova::conductor
   }
-
 }
diff --git a/manifests/profile/base/nova/consoleauth.pp b/manifests/profile/base/nova/consoleauth.pp
index 442cf84..8ccfb8c 100644
--- a/manifests/profile/base/nova/consoleauth.pp
+++ b/manifests/profile/base/nova/consoleauth.pp
@@ -26,10 +26,8 @@
 class tripleo::profile::base::nova::consoleauth (
   $step = hiera('step'),
 ) {
-
   if $step >= 4 {
     include ::tripleo::profile::base::nova
     include ::nova::consoleauth
   }
-
 }
diff --git a/manifests/profile/base/nova/libvirt.pp b/manifests/profile/base/nova/libvirt.pp
index 29ef372..889b80d 100644
--- a/manifests/profile/base/nova/libvirt.pp
+++ b/manifests/profile/base/nova/libvirt.pp
@@ -26,7 +26,6 @@
 class tripleo::profile::base::nova::libvirt (
   $step = hiera('step'),
 ) {
-
   if $step >= 4 {
     include ::tripleo::profile::base::nova
     include ::nova::compute::libvirt::services
diff --git a/manifests/profile/base/nova/scheduler.pp b/manifests/profile/base/nova/scheduler.pp
index 13b4e82..3c9b2c2 100644
--- a/manifests/profile/base/nova/scheduler.pp
+++ b/manifests/profile/base/nova/scheduler.pp
@@ -26,11 +26,9 @@
 class tripleo::profile::base::nova::scheduler (
   $step = hiera('step'),
 ) {
-
   if $step >= 4 {
     include ::tripleo::profile::base::nova
     include ::nova::scheduler
     include ::nova::scheduler::filter
   }
-
 }
diff --git a/manifests/profile/base/nova/vncproxy.pp b/manifests/profile/base/nova/vncproxy.pp
index aa0cc7b..f654fef 100644
--- a/manifests/profile/base/nova/vncproxy.pp
+++ b/manifests/profile/base/nova/vncproxy.pp
@@ -26,10 +26,8 @@
 class tripleo::profile::base::nova::vncproxy (
   $step = hiera('step'),
 ) {
-
   if $step >= 4 {
     include ::tripleo::profile::base::nova
     include ::nova::vncproxy
   }
-
 }
diff --git a/manifests/profile/base/pacemaker.pp b/manifests/profile/base/pacemaker.pp
index de3de3c..2c70eab 100644
--- a/manifests/profile/base/pacemaker.pp
+++ b/manifests/profile/base/pacemaker.pp
@@ -26,7 +26,6 @@
 class tripleo::profile::base::pacemaker (
   $step = hiera('step'),
 ) {
-
   Pcmk_resource <| |> {
     tries     => 10,
     try_sleep => 3,
diff --git a/manifests/profile/base/rabbitmq.pp b/manifests/profile/base/rabbitmq.pp
index 6e86eab..dc6ea4d 100644
--- a/manifests/profile/base/rabbitmq.pp
+++ b/manifests/profile/base/rabbitmq.pp
@@ -18,25 +18,25 @@
 #
 # === Parameters
 #
-# [*nodes*]
-#   (Optional) Array of host(s) for RabbitMQ nodes.
-#   Defaults to hiera('rabbit_node_ips', []).
-#
-# [*ipv6*]
-#   (Optional) Whether to deploy RabbitMQ on IPv6 network.
-#   Defaults to str2bool(hiera('rabbit_ipv6', false)).
+# [*config_variables*]
+#   (Optional) RabbitMQ environment.
+#   Defaults to hiera('rabbitmq_config_variables').
 #
 # [*environment*]
 #   (Optional) RabbitMQ environment.
 #   Defaults to hiera('rabbitmq_environment').
 #
+# [*ipv6*]
+#   (Optional) Whether to deploy RabbitMQ on IPv6 network.
+#   Defaults to str2bool(hiera('rabbit_ipv6', false)).
+#
 # [*kernel_variables*]
 #   (Optional) RabbitMQ environment.
 #   Defaults to hiera('rabbitmq_environment').
 #
-# [*config_variables*]
-#   (Optional) RabbitMQ environment.
-#   Defaults to hiera('rabbitmq_config_variables').
+# [*nodes*]
+#   (Optional) Array of host(s) for RabbitMQ nodes.
+#   Defaults to hiera('rabbit_node_ips', []).
 #
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
@@ -44,14 +44,13 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::rabbitmq (
-  $nodes            = hiera('rabbit_node_ips', []),
-  $ipv6             = str2bool(hiera('rabbit_ipv6', false)),
+  $config_variables = hiera('rabbitmq_config_variables'),
   $environment      = hiera('rabbitmq_environment'),
+  $ipv6             = str2bool(hiera('rabbit_ipv6', false)),
   $kernel_variables = hiera('rabbitmq_kernel_variables'),
-  $config_variables = hiera('rabbitmq_config_variables'),
+  $nodes            = hiera('rabbit_node_ips', []),
   $step             = hiera('step'),
 ) {
-
   # IPv6 environment, necessary for RabbitMQ.
   if $ipv6 {
     $rabbit_env = merge($environment, {
diff --git a/manifests/profile/base/sahara/api.pp b/manifests/profile/base/sahara/api.pp
index dc23d64..df6c4c9 100644
--- a/manifests/profile/base/sahara/api.pp
+++ b/manifests/profile/base/sahara/api.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::sahara::api (
-  $step                    = hiera('step'),
+  $step = hiera('step'),
 ) {
   if $step >= 4 {
     include ::tripleo::profile::base::sahara
diff --git a/manifests/profile/base/sahara/engine.pp b/manifests/profile/base/sahara/engine.pp
index f792a96..db5ec51 100644
--- a/manifests/profile/base/sahara/engine.pp
+++ b/manifests/profile/base/sahara/engine.pp
@@ -26,7 +26,7 @@
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
-
+#
 class tripleo::profile::base::sahara::engine (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
   $step           = hiera('step'),
diff --git a/manifests/profile/base/snmp.pp b/manifests/profile/base/snmp.pp
index 40f7393..2ed6752 100644
--- a/manifests/profile/base/snmp.pp
+++ b/manifests/profile/base/snmp.pp
@@ -18,25 +18,24 @@
 #
 # === Parameters
 #
-# [*step*]
-#   (Optional) The current step in deployment. See tripleo-heat-templates
-#   for more details.
-#   Defaults to hiera('step')
+# [*snmpd_password*]
+#   The SNMP password
+#   Defaults to hiera('snmpd_readonly_user_password')
 #
 # [*snmpd_user*]
 #   The SNMP username
 #   Defaults to hiera('snmpd_readonly_user_name')
 #
-# [*snmpd_password*]
-#   The SNMP password
-#   Defaults to hiera('snmpd_readonly_user_password')
+# [*step*]
+#   (Optional) The current step in deployment. See tripleo-heat-templates
+#   for more details.
+#   Defaults to hiera('step')
 #
 class tripleo::profile::base::snmp (
-  $step           = hiera('step'),
-  $snmpd_user     = hiera('snmpd_readonly_user_name'),
   $snmpd_password = hiera('snmpd_readonly_user_password'),
+  $snmpd_user     = hiera('snmpd_readonly_user_name'),
+  $step           = hiera('step'),
 ) {
-
   if $step >= 4 {
     snmp::snmpv3_user { $snmpd_user:
       authtype => 'MD5',
diff --git a/manifests/profile/base/swift/add_devices.pp b/manifests/profile/base/swift/add_devices.pp
index f61f418..bd4c91c 100644
--- a/manifests/profile/base/swift/add_devices.pp
+++ b/manifests/profile/base/swift/add_devices.pp
@@ -20,11 +20,10 @@
 #
 # [*swift_zones*]
 #   (Optional) The number of swift zones.
-
+#
 define tripleo::profile::base::swift::add_devices(
   $swift_zones = '1'
 ){
-
   # NOTE(dprince): Swift zones is not yet properly wired into the Heat
   # templates. See: https://review.openstack.org/#/c/97758/3
   # For now our regex supports the r1z1-192.0.2.6:%PORT%/d1 syntax or the
diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp
index 40e61ae..1e763a1 100644
--- a/manifests/profile/base/swift/proxy.pp
+++ b/manifests/profile/base/swift/proxy.pp
@@ -23,11 +23,9 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
-#
 class tripleo::profile::base::swift::proxy (
   $step = hiera('step'),
 ) {
-
   if $step >= 4 {
     include ::swift::proxy
     include ::swift::proxy::proxy_logging
diff --git a/manifests/profile/base/swift/ringbuilder.pp b/manifests/profile/base/swift/ringbuilder.pp
index d94c6be..e0f67cd 100644
--- a/manifests/profile/base/swift/ringbuilder.pp
+++ b/manifests/profile/base/swift/ringbuilder.pp
@@ -18,30 +18,33 @@
 #
 # === Parameters
 #
-# [*step*]
+#  [*replicas*]
+#    replicas
+#
+#  [*build_ring*] = true,
+#   (Optional) Whether to build the ring
+#   Defaults to true
+#
+#  [*devices*]
+#   (Optional) The swift devices
+#   Defaults to ''
+#
+#  [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
+#
 #  [*swift_zones*]
 #   (Optional) The swift zones
 #   Defaults to 1
-#  [*devices*]
-#   (Optional) The swift devices
-#   Defaults to ''
-#  [*build_ring*]      = true,
-#   (Optional) Whether to build the ring
-#   Defaults to true
-#  [*replicas*]
-#    replicas
-
+#
 class tripleo::profile::base::swift::ringbuilder (
-  $step = hiera('step'),
-  $swift_zones     = '1',
-  $devices         = '',
-  $build_ring      = true,
   $replicas,
+  $build_ring  = true,
+  $devices     = '',
+  $step        = hiera('step'),
+  $swift_zones = '1',
 ) {
-
   if $step >= 2 {
     # pre-install swift here so we can build rings
     include ::swift
diff --git a/manifests/profile/base/swift/storage.pp b/manifests/profile/base/swift/storage.pp
index 371cb0d..5e266a9 100644
--- a/manifests/profile/base/swift/storage.pp
+++ b/manifests/profile/base/swift/storage.pp
@@ -18,21 +18,20 @@
 #
 # === Parameters
 #
+# [*enable_swift_storage*]
+#   (Optional) enable_swift_storage
+#   Deprecated: defaults to true
+#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*enable_swift_storage*]
-#   (Optional) enable_swift_storage
-#   Deprecated: defaults to true
-#
 class tripleo::profile::base::swift::storage (
-  $step                 = hiera('step'),
   # Deprecated conditional to support ControllerEnableSwiftStorage parameter
   $enable_swift_storage = true,
+  $step                 = hiera('step'),
 ) {
-
   if $step >= 4 {
     if $enable_swift_storage {
       include ::swift::storage::all
diff --git a/manifests/profile/base/trove/api.pp b/manifests/profile/base/trove/api.pp
index 06edf7f..7a78171 100644
--- a/manifests/profile/base/trove/api.pp
+++ b/manifests/profile/base/trove/api.pp
@@ -26,7 +26,7 @@
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
-
+#
 class tripleo::profile::base::trove::api (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
   $step           = hiera('step'),
-- 
cgit 1.2.3-korg