openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Set docker-puppet --health-cmd = /bin/true"

This commit is contained in:
Jenkins 2017-08-29 06:01:53 +00:00 committed by Gerrit Code Review
parent 52804061ff 20e1f0e8c9
commit 53db241cfb
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/docker-puppet.py
View File

@ -248,6 +248,7 @@ def mp_puppet_config((config_volume, puppet_tags, manifest, config_image, volume
dcmd = ['/usr/bin/docker', 'run',
'--user', 'root',
'--name', 'docker-puppet-%s' % config_volume,
'--health-cmd', '/bin/true',
'--env', 'PUPPET_TAGS=%s' % puppet_tags,
'--env', 'NAME=%s' % config_volume,
'--env', 'HOSTNAME=%s' % short_hostname(),