diff options
author | Steve Baker <sbaker@redhat.com> | 2017-02-28 23:34:51 +0000 |
---|---|---|
committer | Steve Baker <sbaker@redhat.com> | 2017-03-01 03:14:49 +0000 |
commit | 93561bde0aaaa82d1ceacccb91ff8b623a9963cb (patch) | |
tree | 4797148d91b358a5c3b07a4f586f4c6d2f16346c /docker/docker-puppet.py | |
parent | c992dcf51a3a6ab75eeb9e15c55e03f317f7633c (diff) |
Switch to dict format for docker_puppet_tasks
This change gives the option of docker-puppet.py data to be in a dict
as well as a list. This allows docker_puppet_tasks data to use the
same keys as the top level puppet config data.
If the yaql fu can be worked out to build the top level data,
docker-puppet.py can later drop the list format entirely.
Change-Id: I7e2294c6c898d2340421c93516296ccf120aa6d2
Diffstat (limited to 'docker/docker-puppet.py')
-rwxr-xr-x | docker/docker-puppet.py | 9 |
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 '' |