Make various password descriptions consistent

Since these are obviously global parameters they shouldn't specify
what will be using them because they are used in multiple places.

Change-Id: I5054c2d67dffe802e37f8391dd7bad4721e29831
Partial-Bug: 1700664

17 files changed, 18 insertions, 22 deletions

diff --git a/docker/services/haproxy.yaml b/docker/services/haproxy.yaml
index 21baf5c6..f080dcb2 100644
--- a/docker/services/haproxy.yaml
+++ b/docker/services/haproxy.yaml
@@ -46,7 +46,7 @@ parameters:
         The filepath of the certificate as it will be stored in the controller.
     type: string
   RedisPassword:
-    description: The password for Redis
+    description: The password for the redis service account.
     type: string
     hidden: true
   MonitoringSubscriptionHaproxy:
diff --git a/puppet/major_upgrade_steps.j2.yaml b/puppet/major_upgrade_steps.j2.yaml
index 625ff4d9..11113eec 100644
--- a/puppet/major_upgrade_steps.j2.yaml
+++ b/puppet/major_upgrade_steps.j2.yaml
@@ -32,7 +32,7 @@ parameters:
     default: 'regionOne'
     description: Keystone region for endpoint
   NovaPassword:
-    description: The password for the nova service and db account, used by nova-api.
+    description: The password for the nova service and db account
     type: string
     hidden: true
 
diff --git a/puppet/services/ceph-rgw.yaml b/puppet/services/ceph-rgw.yaml
index aa025684..29629461 100644
--- a/puppet/services/ceph-rgw.yaml
+++ b/puppet/services/ceph-rgw.yaml
@@ -40,7 +40,7 @@ parameters:
     type: string
     hidden: true
   SwiftPassword:
-    description: The password for the swift service account, used by the Ceph RGW services.
+    description: The password for the swift service account
     type: string
     hidden: true
   KeystoneRegion:
diff --git a/puppet/services/database/mysql.yaml b/puppet/services/database/mysql.yaml
index 9b8386c1..f39c9712 100644
--- a/puppet/services/database/mysql.yaml
+++ b/puppet/services/database/mysql.yaml
@@ -51,7 +51,7 @@ parameters:
     description: Whether to use Galera instead of regular MariaDB.
     type: boolean
   NovaPassword:
-    description: The password for the nova db account
+    description: The password for the nova service and db account
     type: string
     hidden: true
   EnableInternalTLS:
diff --git a/puppet/services/database/redis-base.yaml b/puppet/services/database/redis-base.yaml
index d15b30cb..2a6a89e9 100644
--- a/puppet/services/database/redis-base.yaml
+++ b/puppet/services/database/redis-base.yaml
@@ -5,7 +5,7 @@ description: >
 
 parameters:
   RedisPassword:
-    description: The password for Redis
+    description: The password for the redis service account.
     type: string
     hidden: true
   RedisFDLimit:
diff --git a/puppet/services/external-swift-proxy.yaml b/puppet/services/external-swift-proxy.yaml
index a4a25d9e..ac1f11ac 100644
--- a/puppet/services/external-swift-proxy.yaml
+++ b/puppet/services/external-swift-proxy.yaml
@@ -44,7 +44,7 @@ parameters:
     type: string
     default: 'service'
   SwiftPassword:
-    description: The password for the swift service account, used by the swift proxy services.
+    description: The password for the swift service account
     type: string
     hidden: true
   KeystoneRegion:
diff --git a/puppet/services/haproxy.yaml b/puppet/services/haproxy.yaml
index 0af132e7..a37135da 100644
--- a/puppet/services/haproxy.yaml
+++ b/puppet/services/haproxy.yaml
@@ -51,7 +51,7 @@ parameters:
     description: Whether or not to enable the HAProxy stats interface.
     type: boolean
   RedisPassword:
-    description: The password for Redis
+    description: The password for the redis service account.
     type: string
     hidden: true
   MonitoringSubscriptionHaproxy:
diff --git a/puppet/services/manila-scheduler.yaml b/puppet/services/manila-scheduler.yaml
index 160b4e4a..7d43f685 100644
--- a/puppet/services/manila-scheduler.yaml
+++ b/puppet/services/manila-scheduler.yaml
@@ -32,7 +32,7 @@ parameters:
     type: json
   NovaPassword:
     type: string
-    description: The password for the nova service and db account, used by nova-api.
+    description: The password for the nova service and db account
     hidden: true
   NeutronPassword:
     description: The password for the neutron service and db account, used by neutron agents.
diff --git a/puppet/services/monitoring/sensu-client.yaml b/puppet/services/monitoring/sensu-client.yaml
index f2b062e0..a9ffabe5 100644
--- a/puppet/services/monitoring/sensu-client.yaml
+++ b/puppet/services/monitoring/sensu-client.yaml
@@ -31,8 +31,9 @@ parameters:
       via parameter_defaults in the resource registry.
     type: json
   AdminPassword:
-    description: Keystone admin user password
+    description: The password for the keystone admin account, used for monitoring, querying neutron etc.
     type: string
+    hidden: true
   KeystoneRegion:
     default: 'regionOne'
     description: Keystone region for endpoint
diff --git a/puppet/services/network/contrail-base.yaml b/puppet/services/network/contrail-base.yaml
index 9ee8a651..542c3d76 100644
--- a/puppet/services/network/contrail-base.yaml
+++ b/puppet/services/network/contrail-base.yaml
@@ -39,7 +39,7 @@ parameters:
     type: string
     default: 'no-auth'
   AdminPassword:
-    description: Keystone admin user password
+    description: The password for the keystone admin account, used for monitoring, querying neutron etc.
     type: string
     hidden: true
   AdminTenantName:
@@ -47,7 +47,7 @@ parameters:
     type: string
     default: 'admin'
   AdminToken:
-    description: Keystone admin token
+    description: The keystone auth secret and db password.
     type: string
     hidden: true
   AdminUser:
diff --git a/puppet/services/neutron-api.yaml b/puppet/services/neutron-api.yaml
index d650b11f..459a968a 100644
--- a/puppet/services/neutron-api.yaml
+++ b/puppet/services/neutron-api.yaml
@@ -50,7 +50,7 @@ parameters:
     description: Allow automatic l3-agent failover
     type: string
   NovaPassword:
-    description: The password for the nova service and db account, used by nova-api.
+    description: The password for the nova service and db account
     type: string
     hidden: true
   NeutronEnableDVR:
diff --git a/puppet/services/neutron-compute-plugin-nuage.yaml b/puppet/services/neutron-compute-plugin-nuage.yaml
index 5842149f..f1a56530 100644
--- a/puppet/services/neutron-compute-plugin-nuage.yaml
+++ b/puppet/services/neutron-compute-plugin-nuage.yaml
@@ -31,7 +31,7 @@ parameters:
                  via parameter_defaults in the resource registry.
     type: json
   NovaPassword:
-    description: The password for the nova service account, used by nova-api.
+    description: The password for the nova service and db account
     type: string
     hidden: true
   NuageMetadataPort:
diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml
index a28f4672..b413fb12 100644
--- a/puppet/services/nova-api.yaml
+++ b/puppet/services/nova-api.yaml
@@ -35,7 +35,7 @@ parameters:
     description: Number of workers for Nova services.
     type: number
   NovaPassword:
-    description: The password for the nova service and db account, used by nova-api.
+    description: The password for the nova service and db account
     type: string
     hidden: true
   KeystoneRegion:
diff --git a/puppet/services/nova-base.yaml b/puppet/services/nova-base.yaml
index 82f8bc13..08302ee9 100644
--- a/puppet/services/nova-base.yaml
+++ b/puppet/services/nova-base.yaml
@@ -41,7 +41,7 @@ parameters:
     constraints:
       - allowed_values: [ 'messagingv2', 'noop' ]
   NovaPassword:
-    description: The password for the nova service and db account, used by nova-api.
+    description: The password for the nova service and db account
     type: string
     hidden: true
   NeutronPassword:
diff --git a/puppet/services/nova-placement.yaml b/puppet/services/nova-placement.yaml
index 5cb4ef5c..916cefd9 100644
--- a/puppet/services/nova-placement.yaml
+++ b/puppet/services/nova-placement.yaml
@@ -35,7 +35,7 @@ parameters:
     description: Number of workers for Nova services.
     type: number
   NovaPassword:
-    description: The password for the nova service and db account, used by nova-placement.
+    description: The password for the nova service and db account
     type: string
     hidden: true
   KeystoneRegion:
diff --git a/puppet/services/swift-proxy.yaml b/puppet/services/swift-proxy.yaml
index 283bb3f3..06e8180d 100644
--- a/puppet/services/swift-proxy.yaml
+++ b/puppet/services/swift-proxy.yaml
@@ -35,7 +35,7 @@ parameters:
     description: Set to True to enable debugging on all services.
     type: string
   SwiftPassword:
-    description: The password for the swift service account, used by the swift proxy services.
+    description: The password for the swift service account
     type: string
     hidden: true
   SwiftProxyNodeTimeout:
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index 438f196e..5e7d79f8 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -62,7 +62,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
                                    'NeutronMetadataProxySharedSecret': [
                                        'description', 'hidden'],
                                    'ServiceNetMap': ['description', 'default'],
-                                   'RedisPassword': ['description'],
                                    'EC2MetadataIp': ['default'],
                                    'network': ['default'],
                                    'ControlPlaneIP': ['default',
@@ -74,7 +73,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
                                    'NeutronWorkers': ['description'],
                                    'TenantIpSubnet': ['description'],
                                    'ExternalNetName': ['description'],
-                                   'AdminToken': ['description'],
                                    'ControlPlaneDefaultRoute': ['default'],
                                    'StorageMgmtNetName': ['description'],
                                    'ServerMetadata': ['description'],
@@ -108,16 +106,13 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
                                    'HostCpusList': ['default', 'constraints'],
                                    'InternalApiAllocationPools': ['default'],
                                    'NodeIndex': ['description'],
-                                   'SwiftPassword': ['description'],
                                    'name': ['description', 'default'],
                                    'StorageNetName': ['description'],
                                    'ManagementNetName': ['description'],
                                    'NeutronPublicInterface': ['description'],
                                    'RoleParameters': ['description'],
-                                   'AdminPassword': ['description', 'hidden'],
                                    'ManagementInterfaceDefaultRoute':
                                        ['default'],
-                                   'NovaPassword': ['description'],
                                    'image': ['description', 'default'],
                                    'NeutronBigswitchAgentEnabled': ['default'],
                                    'EndpointMap': ['description', 'default'],