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

2 files changed, 22 insertions, 30 deletions

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,
     }
-
   }
-
 }