diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-26 04:01:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-26 04:01:39 +0000 |
| commit | d0ef9ff26cef85ab56ebe2d6b4b685b64dc5ba64 (patch) | |
| tree | 3a63cb5a3e123af6170ffc6b6e4d7e49d9d9cbe3 /docker | |
| parent | 0825568aa6ba2cd3567a65d14b0f8ff37a688b60 (diff) | |
| parent | 7f5c616a949dc1649ac22484d7fd059b04cae6c5 (diff) | |
Merge "docker-puppet: skip empty volume entries"
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/docker-puppet.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/docker-puppet.py b/docker/docker-puppet.py index 0f079436..8f95208f 100755 --- a/docker/docker-puppet.py +++ b/docker/docker-puppet.py @@ -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]) |