From d1aaf0aadf487ccfcdecb47f3cfbf6087401242b Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Fri, 25 Aug 2017 22:27:24 -0400
Subject: [PATCH] Manually set healthchecks for _cron services

The docker _cron services show up as (unhealthy) due to
them sharing the containers for the OpenStack services.
As such we need to manually override the health checks
for these services. By setting them to /bin/true
the services should show up has healthy.

Change-Id: I46e12bcec226fbe2768c7fe8f0e7719df46401a9
Closes-bug: #1713183
---
 docker/services/cinder-api.yaml | 2 ++
 docker/services/heat-api.yaml   | 2 ++
 docker/services/keystone.yaml   | 2 ++
 docker/services/nova-api.yaml   | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/docker/services/cinder-api.yaml b/docker/services/cinder-api.yaml
index 519b232897..93d09ca0f5 100644
--- a/docker/services/cinder-api.yaml
+++ b/docker/services/cinder-api.yaml
@@ -163,6 +163,8 @@ outputs:
             user: root
             privileged: false
             restart: always
+            healthcheck:
+              test: /bin/true
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
diff --git a/docker/services/heat-api.yaml b/docker/services/heat-api.yaml
index 54c7beddbb..6c1621f1ec 100644
--- a/docker/services/heat-api.yaml
+++ b/docker/services/heat-api.yaml
@@ -136,6 +136,8 @@ outputs:
             user: root
             privileged: false
             restart: always
+            healthcheck:
+              test: /bin/true
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml
index 4c2c1d165f..97b4c5d571 100644
--- a/docker/services/keystone.yaml
+++ b/docker/services/keystone.yaml
@@ -175,6 +175,8 @@ outputs:
             privileged: false
             restart: always
             command: ['/bin/bash', '-c', '/usr/local/bin/kolla_set_configs && /usr/sbin/crond -n']
+            healthcheck:
+              test: /bin/true
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml
index 37c4da5bad..7142b70ec2 100644
--- a/docker/services/nova-api.yaml
+++ b/docker/services/nova-api.yaml
@@ -196,6 +196,8 @@ outputs:
             user: root
             privileged: false
             restart: always
+            healthcheck:
+              test: /bin/true
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}