summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-24 04:11:16 +0000
committerGerrit Code Review <review@openstack.org>2017-07-24 04:11:16 +0000
commit0fffbe3c3c97560a97d943e9ec3d64f55b413462 (patch)
tree3d5cc8245fa6a9527f41a92343303fdb9543e573 /tools
parentad370ba063d4e5b97dc446b33abea44c61908cd1 (diff)
parent0fbc2ff4878912cfcbea959a76b08330e80d8dc4 (diff)
Merge "Support configurable Zaqar backends"
Diffstat (limited to 'tools')
-rwxr-xr-xtools/yaml-validate.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index 438f196e..33d12eec 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -304,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):