openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Pass the DOCKER_* env vars when running docker"

This commit is contained in:
Jenkins 2017-03-13 20:13:41 +00:00 committed by Gerrit Code Review
parent 25a4719c98 3cba27131a
commit 0162749f71
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/docker-puppet.py
View File

@ -210,6 +210,11 @@ def mp_puppet_config((config_volume, puppet_tags, manifest, config_image, volume
dcmd.extend(['--entrypoint', sh_script])
env = {}
# NOTE(flaper87): Always copy the DOCKER_* environment variables as
# they contain the access data for the docker daemon.
for k in filter(lambda k: k.startswith('DOCKER'), os.environ.keys()):
env[k] = os.environ.get(k)
if os.environ.get('NET_HOST', 'false') == 'true':
print('NET_HOST enabled')
dcmd.extend(['--net', 'host', '--volume',