Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (from parent 1: 3dfffeb)
Set docker-puppet --health-cmd = /bin/true
authorDan Prince <dprince@redhat.com>
Sat, 26 Aug 2017 02:35:47 +0000 (22:35 -0400)
committerEmilien Macchi <emilien@redhat.com>
Tue, 29 Aug 2017 13:43:07 +0000 (13:43 +0000)
Change-Id: Idf627a348cad8d5287c82cb393367210f1c760cf
Closes-bug: #1713185
(cherry picked from commit 20e1f0e8c9a2bbc3734f6eec0ee9ac2d5156f166)

docker/docker-puppet.py patch | blob | history

diff --git a/docker/docker-puppet.py b/docker/docker-puppet.py
index fadd12d..4659cf5 100755 (executable)
--- 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(),