Merge "Pass the DOCKER_* env vars when running docker"

[apex-tripleo-heat-templates.git] / docker / docker-puppet.py

diff --git a/docker/docker-puppet.py b/docker/docker-puppet.py
index 6cee68f..0f07943 100755 (executable)
--- a/docker/docker-puppet.py
+++ b/docker/docker-puppet.py
@@ -102,6 +102,9 @@ for service in (json_data or []):
     config_image = service[3] or ''
     volumes = service[4] if len(service) > 4 else []
 
+    if not manifest or not config_image:
+        continue
+
     print('---------')
     print('config_volume %s' % config_volume)
     print('puppet_tags %s' % puppet_tags)