Merge "Manually set healthchecks for _cron services" into stable/pike

diff --git a/docker/services/cinder-api.yaml b/docker/services/cinder-api.yaml
index 519b232..93d09ca 100644 (file)
--- 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 54c7bed..6c1621f 100644 (file)
--- 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 4c2c1d1..97b4c5d 100644 (file)
--- 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 37c4da5..7142b70 100644 (file)
--- 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]}