Merge "Switch to dict format for docker_puppet_tasks"

1 files changed, 9 insertions, 0 deletions

diff --git a/docker/docker-puppet.py b/docker/docker-puppet.py
index 86c8ec98..d9496af6 100755
--- a/docker/docker-puppet.py
+++ b/docker/docker-puppet.py
@@ -87,6 +87,15 @@ configs = {}
 for service in (json_data or []):
     if service is None:
         continue
+    if isinstance(service, dict):
+        service = [
+            service.get('config_volume'),
+            service.get('puppet_tags'),
+            service.get('step_config'),
+            service.get('config_image'),
+            service.get('volumes', []),
+        ]
+
     config_volume = service[0] or ''
     puppet_tags = service[1] or ''
     manifest = service[2] or ''