X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fdocker-puppet.py;h=157bf63faac251c3e3f24063de1cb641df5b5441;hb=d4a7cfb0721b86581f37239d0257fbca8f949122;hp=86c8ec98accfb5a86e4e6440f0fecbcd0140c3f1;hpb=721faef63167d8d96725da69549524904d83d052;p=apex-tripleo-heat-templates.git diff --git a/docker/docker-puppet.py b/docker/docker-puppet.py index 86c8ec98..157bf63f 100755 --- a/docker/docker-puppet.py +++ b/docker/docker-puppet.py @@ -87,12 +87,24 @@ 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 '' 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)