aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2017-06-26 10:40:46 -0400
committerSteve Baker <sbaker@redhat.com>2017-07-24 10:27:32 +1200
commit0fbc2ff4878912cfcbea959a76b08330e80d8dc4 (patch)
tree100f184e1c0fdf948a3c3aab5bf9596e53f092fe /tools
parent9f1fbcb40a030d40b3241b6684fd554e12732dd1 (diff)
Support configurable Zaqar backends
This patch adds parameters to configure alternative version of the Zaqar messaging and management backends. The intent is to make use of these settings in the containers undercloud to use swift/mysql backends as a default thus avoiding the dependency on MongoDB. Change-Id: Ifd6a561737184c9322192ffc9a412c77d6eac3e9 Depends-On: Ie6a56b9163950cee2c0341afa0c0ddce665f3704 Depends-On: I3598e39c0a3cdf80b96e728d9aa8a7e6505e0690
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 3828766f..d35cba63 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -219,11 +219,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):