X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tools%2Fyaml-validate.py;h=33d12eec0c06f0fd82e8f7f83c5577eecac29e54;hb=05f773006a0f8f1ea50ba23bfaa16ef68ef6ec55;hp=c9c7aff920f0776fc220c7efee138b38d8d98b7d;hpb=83f8b300a3ae0f801aa94ece8196282cb55ffe0a;p=apex-tripleo-heat-templates.git

diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index c9c7aff9..33d12eec 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -56,6 +56,7 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
                                    'TenantNetCidr': ['default'],
                                    'TenantAllocationPools': ['default'],
                                    'InternalApiNetCidr': ['default'],
+                                   'UpdateIdentifier': ['description'],
                                    # TODO(bnemec): Address these existing
                                    # inconsistencies.
                                    'NeutronMetadataProxySharedSecret': [
@@ -85,7 +86,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
                                    'FixedIPs': ['description'],
                                    'ExternalIpSubnet': ['description'],
                                    'NeutronBridgeMappings': ['description'],
-                                   'EnablePackageInstall': ['description'],
                                    'ExtraConfig': ['description'],
                                    'InternalApiIpSubnet': ['description'],
                                    'DefaultPasswords': ['description',
@@ -94,14 +94,11 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
                                                                'default',
                                                                'constraints'],
                                    'KeyName': ['constraints'],
-                                   'Debug': ['description'],
                                    'TenantNetName': ['description'],
                                    'StorageIpSubnet': ['description'],
                                    'OVNSouthboundServerPort': ['description'],
                                    'ExternalInterfaceDefaultRoute':
                                        ['description', 'default'],
-                                   'DeployIdentifier': ['description',
-                                                        'default'],
                                    'ExternalIpUri': ['description'],
                                    'IPPool': ['description'],
                                    'ControlPlaneNetwork': ['description'],
@@ -112,8 +109,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
                                    'InternalApiAllocationPools': ['default'],
                                    'NodeIndex': ['description'],
                                    'SwiftPassword': ['description'],
-                                   'UpdateIdentifier': ['description',
-                                                        'default'],
                                    'name': ['description', 'default'],
                                    'StorageNetName': ['description'],
                                    'ManagementNetName': ['description'],
@@ -309,11 +304,13 @@ def validate_docker_service(filename, tpl):
         if 'docker_config' in role_data:
             docker_config = role_data['docker_config']
             for _, step in docker_config.items():
+                if not isinstance(step, dict):
+                    # NOTE(mandre) this skips everything that is not a dict
+                    # so we may ignore some containers definitions if they
+                    # are in a map_merge for example
+                    continue
                 for _, container in step.items():
                     if not isinstance(container, dict):
-                        # NOTE(mandre) this skips everything that is not a dict
-                        # so we may ignore some containers definitions if they
-                        # are in a map_merge for example
                         continue
                     command = container.get('command', '')
                     if isinstance(command, list):