Merge "Make EnablePackageInstall and Debug descriptions consistent"

ci/environments/multinode-core.yaml

@@ -21,6 +21,7 @@ parameters:
   Debug:
     type: string
     default: ''
+    description: Set to True to enable debugging on all services.
 
 resources:
 

docker/services/nova-libvirt.yaml

@@ -14,7 +14,7 @@ parameters:
     type: string
   EnablePackageInstall:
     default: 'false'
-    description: Set to true to enable package installation
+    description: Set to true to enable package installation at deploy time
     type: boolean
   ServiceData:
     default: {}

puppet/services/congress.yaml

@@ -37,6 +37,7 @@ parameters:
   Debug:
     type: string
     default: ''
+    description: Set to True to enable debugging on all services.
   CongressDebug:
     default: ''
     description: Set to True to enable debugging Glance service.

puppet/services/ec2-api.yaml

@@ -61,7 +61,7 @@ parameters:
       path: /var/log/ec2api/ec2api.log
   EnablePackageInstall:
     default: 'false'
-    description: Set to true to enable package installation via Puppet
+    description: Set to true to enable package installation at deploy time
     type: boolean
   Ec2ApiPolicies:
     description: |

puppet/services/keystone.yaml

@@ -67,6 +67,7 @@ parameters:
   Debug:
     type: string
     default: ''
+    description: Set to True to enable debugging on all services.
   KeystoneDebug:
     default: ''
     description: Set to True to enable debugging Keystone service.

puppet/services/neutron-l3-compute-dvr.yaml

@@ -34,6 +34,7 @@ parameters:
   Debug:
     type: string
     default: ''
+    description: Set to True to enable debugging on all services.
   MonitoringSubscriptionNeutronL3Dvr:
     default: 'overcloud-neutron-l3-dvr'
     type: string

puppet/services/neutron-l3.yaml

@@ -33,6 +33,7 @@ parameters:
   Debug:
     type: string
     default: ''
+    description: Set to True to enable debugging on all services.
   NeutronL3AgentMode:
     description: |
       Agent mode for L3 agent. Must be one of legacy or dvr_snat.

puppet/services/tacker.yaml

@@ -37,6 +37,7 @@ parameters:
   Debug:
     type: string
     default: ''
+    description: Set to True to enable debugging on all services.
   TackerDebug:
     default: ''
     description: Set to True to enable debugging Tacker service.

puppet/services/tripleo-packages.yaml

@@ -32,7 +32,7 @@ parameters:
     type: json
   EnablePackageInstall:
     default: 'false'
-    description: Set to true to enable package installation via Puppet
+    description: Set to true to enable package installation at deploy time
     type: boolean
 
 outputs:

tools/yaml-validate.py

@@ -85,7 +85,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
                                    'FixedIPs': ['description'],
                                    'ExternalIpSubnet': ['description'],
                                    'NeutronBridgeMappings': ['description'],
-                                   'EnablePackageInstall': ['description'],
                                    'ExtraConfig': ['description'],
                                    'InternalApiIpSubnet': ['description'],
                                    'DefaultPasswords': ['description',
@@ -94,7 +93,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
                                                                'default',
                                                                'constraints'],
                                    'KeyName': ['constraints'],
-                                   'Debug': ['description'],
                                    'TenantNetName': ['description'],
                                    'StorageIpSubnet': ['description'],
                                    'OVNSouthboundServerPort': ['description'],