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
Merge "Add environment for deployed-server with pacemaker"
[apex-tripleo-heat-templates.git]
/
docker
/
docker-puppet.py
diff --git
a/docker/docker-puppet.py
b/docker/docker-puppet.py
index
2d56081
..
fe87ce7
100755
(executable)
--- a/
docker/docker-puppet.py
+++ b/
docker/docker-puppet.py
@@
-72,7
+72,9
@@
with open(config_file) as f:
configs = {}
-for service in json_data:
+for service in (json_data or []):
+ if service is None:
+ continue
config_volume = service[0] or ''
puppet_tags = service[1] or ''
manifest = service[2] or ''