aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-30 21:34:57 +0000
committerGerrit Code Review <review@openstack.org>2017-08-30 21:34:58 +0000
commitf6f232fc6887f6e19a3c7ef30969eacaf00104c9 (patch)
tree43b2781a37a7a14a0950f0081031ed7e53adbc28 /docker
parenta813b056f2c959151563ec6558496e479e9dbb43 (diff)
parent0ef71f33e8b97421b6847225a3bfd4d8200b1df1 (diff)
Merge "Set docker-puppet --health-cmd = /bin/true" into stable/pike
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/docker-puppet.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/docker/docker-puppet.py b/docker/docker-puppet.py
index fadd12d..4659cf5 100755
--- a/docker/docker-puppet.py
+++ b/docker/docker-puppet.py
@@ -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(),