From: Dan Prince <dprince@redhat.com>
Date: Sat, 26 Aug 2017 02:35:47 +0000 (-0400)
Subject: Set docker-puppet --health-cmd = /bin/true
X-Git-Tag: opnfv-6.0.0~179^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0ef71f33e8b97421b6847225a3bfd4d8200b1df1;p=apex-tripleo-heat-templates.git

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

Change-Id: Idf627a348cad8d5287c82cb393367210f1c760cf
Closes-bug: #1713185
(cherry picked from commit 20e1f0e8c9a2bbc3734f6eec0ee9ac2d5156f166)
---

diff --git a/docker/docker-puppet.py b/docker/docker-puppet.py
index fadd12d3..4659cf53 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(),