aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-09-04 20:58:59 +0000
committerGerrit Code Review <review@openstack.org>2017-09-04 20:59:00 +0000
commitec4f70f24651b90c75477812690eaf3fbbfdcd55 (patch)
tree0a5c6fec4fc10bd2652ba54b4f9ff3ea8ecbe059
parent9b3170ce17d6234cecee31cd210158e19809dc22 (diff)
parentfc9dc2afa505d2fadccb2d5df17fbe226b53eacb (diff)
Merge "Manually set healthchecks for _cron services" into stable/pike
-rw-r--r--docker/services/cinder-api.yaml2
-rw-r--r--docker/services/heat-api.yaml2
-rw-r--r--docker/services/keystone.yaml2
-rw-r--r--docker/services/nova-api.yaml2
4 files changed, 8 insertions, 0 deletions
diff --git a/docker/services/cinder-api.yaml b/docker/services/cinder-api.yaml
index 519b2328..93d09ca0 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 54c7bedd..6c1621f1 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 4c2c1d16..97b4c5d5 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 37c4da5b..7142b70e 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]}