Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Don't curl metadata server in userdata example
[apex-tripleo-heat-templates.git]
/
tools
/
yaml-validate.py
diff --git
a/tools/yaml-validate.py
b/tools/yaml-validate.py
index
d6d5194
..
33d12ee
100755
(executable)
--- 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'],
'TenantNetCidr': ['default'],
'TenantAllocationPools': ['default'],
'InternalApiNetCidr': ['default'],
+ 'UpdateIdentifier': ['description'],
# TODO(bnemec): Address these existing
# inconsistencies.
'NeutronMetadataProxySharedSecret': [
# TODO(bnemec): Address these existing
# inconsistencies.
'NeutronMetadataProxySharedSecret': [
@@
-98,8
+99,6
@@
PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
'OVNSouthboundServerPort': ['description'],
'ExternalInterfaceDefaultRoute':
['description', 'default'],
'OVNSouthboundServerPort': ['description'],
'ExternalInterfaceDefaultRoute':
['description', 'default'],
- 'DeployIdentifier': ['description',
- 'default'],
'ExternalIpUri': ['description'],
'IPPool': ['description'],
'ControlPlaneNetwork': ['description'],
'ExternalIpUri': ['description'],
'IPPool': ['description'],
'ControlPlaneNetwork': ['description'],
@@
-110,8
+109,6
@@
PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
'InternalApiAllocationPools': ['default'],
'NodeIndex': ['description'],
'SwiftPassword': ['description'],
'InternalApiAllocationPools': ['default'],
'NodeIndex': ['description'],
'SwiftPassword': ['description'],
- 'UpdateIdentifier': ['description',
- 'default'],
'name': ['description', 'default'],
'StorageNetName': ['description'],
'ManagementNetName': ['description'],
'name': ['description', 'default'],
'StorageNetName': ['description'],
'ManagementNetName': ['description'],
@@
-307,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 '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):
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):
continue
command = container.get('command', '')
if isinstance(command, list):