openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "docker-puppet: skip empty volume entries"

This commit is contained in:
Jenkins 2017-03-26 04:01:38 +00:00 committed by Gerrit Code Review
parent 0825568aa6 7f5c616a94
commit d0ef9ff26c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/docker-puppet.py
View File

@ -205,7 +205,8 @@ def mp_puppet_config((config_volume, puppet_tags, manifest, config_image, volume
'--volume', '%s:%s:rw' % (sh_script, sh_script) ]
for volume in volumes:
dcmd.extend(['--volume', volume])
if volume:
dcmd.extend(['--volume', volume])
dcmd.extend(['--entrypoint', sh_script])