diff options
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/yaml-validate.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py index 33d12eec..374cd6e3 100755 --- a/tools/yaml-validate.py +++ b/tools/yaml-validate.py @@ -31,6 +31,7 @@ envs_containing_endpoint_map = ['tls-endpoints-public-dns.yaml', 'tls-endpoints-public-ip.yaml', 'tls-everywhere-endpoints-dns.yaml'] ENDPOINT_MAP_FILE = 'endpoint_map.yaml' +OPTIONAL_SECTIONS = ['service_workflow_tasks'] REQUIRED_DOCKER_SECTIONS = ['service_name', 'docker_config', 'puppet_config', 'config_settings', 'step_config'] OPTIONAL_DOCKER_SECTIONS = ['docker_puppet_tasks', 'upgrade_tasks', @@ -62,7 +63,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'], 'NeutronMetadataProxySharedSecret': [ 'description', 'hidden'], 'ServiceNetMap': ['description', 'default'], - 'RedisPassword': ['description'], 'EC2MetadataIp': ['default'], 'network': ['default'], 'ControlPlaneIP': ['default', @@ -74,7 +74,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'], 'NeutronWorkers': ['description'], 'TenantIpSubnet': ['description'], 'ExternalNetName': ['description'], - 'AdminToken': ['description'], 'ControlPlaneDefaultRoute': ['default'], 'StorageMgmtNetName': ['description'], 'ServerMetadata': ['description'], @@ -108,16 +107,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'], @@ -271,6 +267,8 @@ def validate_docker_service(filename, tpl): else: if section_name in OPTIONAL_DOCKER_SECTIONS: continue + elif section_name in OPTIONAL_SECTIONS: + continue else: print('ERROR: %s is extra in role_data for %s.' % (section_name, filename)) |