From 610850140d605b18f4a28099f160fff1e489443d Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Wed, 1 Mar 2017 03:09:31 +0000 Subject: Put docker puppet config in puppet_config dict This approach removes the need for the yaql zip to build the docker-puppet data by building the data in a puppet_config dict. This allows a future change to make docker-puppet.py only accept dict data. Currently the step_config is left where it is and referenced inside puppet_config, but feedback is welcome whether this is necessary or desirable. Change-Id: I4a4d7a6fd2735cb841174af305dbb62e0b3d3e8c --- docker/docker-puppet.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docker/docker-puppet.py') diff --git a/docker/docker-puppet.py b/docker/docker-puppet.py index d9496af6..157bf63f 100755 --- 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) -- cgit 1.2.3-korg