From 627971b2a19325384df0368649004f019d3bad63 Mon Sep 17 00:00:00 2001 From: Ian Main Date: Mon, 11 Sep 2017 21:59:33 -0400 Subject: [PATCH] Explicitly set healthcheck command. We were setting them in the Dockerfile's previously. However this caused the healtcheck commands to always run regardless of which process we were running in the container. This caused 'unhealthy' containers at times they were never intended to be checked. This change makes it so they are explicitly set. Change-Id: I7bc12d236b3cc7a52d3e6aa706fd04675dad3a9a --- docker/services/aodh-evaluator.yaml | 2 ++ docker/services/aodh-listener.yaml | 2 ++ docker/services/aodh-notifier.yaml | 2 ++ docker/services/ceilometer-agent-central.yaml | 2 ++ docker/services/ceilometer-agent-ipmi.yaml | 2 ++ docker/services/ceilometer-agent-notification.yaml | 2 ++ docker/services/cinder-api.yaml | 2 -- docker/services/cinder-backup.yaml | 2 ++ docker/services/cinder-scheduler.yaml | 2 ++ docker/services/cinder-volume.yaml | 2 ++ docker/services/database/mysql.yaml | 2 ++ docker/services/glance-api.yaml | 2 ++ docker/services/heat-api-cfn.yaml | 2 ++ docker/services/heat-api.yaml | 4 ++-- docker/services/heat-engine.yaml | 2 ++ docker/services/ironic-api.yaml | 2 ++ docker/services/ironic-conductor.yaml | 2 ++ docker/services/ironic-pxe.yaml | 2 ++ docker/services/keystone.yaml | 4 ++-- docker/services/manila-scheduler.yaml | 2 ++ docker/services/mistral-engine.yaml | 2 ++ docker/services/mistral-executor.yaml | 2 ++ docker/services/neutron-dhcp.yaml | 2 ++ docker/services/neutron-l3.yaml | 2 ++ docker/services/neutron-metadata.yaml | 2 ++ docker/services/neutron-ovs-agent.yaml | 2 ++ docker/services/nova-api.yaml | 4 ++-- docker/services/nova-compute.yaml | 2 ++ docker/services/nova-conductor.yaml | 2 ++ docker/services/nova-consoleauth.yaml | 2 ++ docker/services/nova-ironic.yaml | 2 ++ docker/services/nova-scheduler.yaml | 2 ++ docker/services/nova-vnc-proxy.yaml | 2 ++ docker/services/octavia-health-manager.yaml | 2 ++ docker/services/octavia-housekeeping.yaml | 2 ++ docker/services/octavia-worker.yaml | 2 ++ docker/services/opendaylight-api.yaml | 4 +++- docker/services/rabbitmq.yaml | 2 ++ docker/services/sahara-engine.yaml | 2 ++ docker/services/sensu-client.yaml | 2 ++ docker/services/swift-proxy.yaml | 2 ++ docker/services/swift-storage.yaml | 6 ++++++ 42 files changed, 87 insertions(+), 9 deletions(-) diff --git a/docker/services/aodh-evaluator.yaml b/docker/services/aodh-evaluator.yaml index 077ad46e63..4a24db0e1a 100644 --- a/docker/services/aodh-evaluator.yaml +++ b/docker/services/aodh-evaluator.yaml @@ -96,6 +96,8 @@ outputs: net: host privileged: false restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/aodh-listener.yaml b/docker/services/aodh-listener.yaml index 4471884b58..8da4b2bba5 100644 --- a/docker/services/aodh-listener.yaml +++ b/docker/services/aodh-listener.yaml @@ -96,6 +96,8 @@ outputs: net: host privileged: false restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/aodh-notifier.yaml b/docker/services/aodh-notifier.yaml index ffed5aface..ee6db2b69a 100644 --- a/docker/services/aodh-notifier.yaml +++ b/docker/services/aodh-notifier.yaml @@ -96,6 +96,8 @@ outputs: net: host privileged: false restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/ceilometer-agent-central.yaml b/docker/services/ceilometer-agent-central.yaml index 7033e0b06e..1b74daed7f 100644 --- a/docker/services/ceilometer-agent-central.yaml +++ b/docker/services/ceilometer-agent-central.yaml @@ -91,6 +91,8 @@ outputs: net: host privileged: false restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/ceilometer-agent-ipmi.yaml b/docker/services/ceilometer-agent-ipmi.yaml index a139f29ff0..05748ddec1 100644 --- a/docker/services/ceilometer-agent-ipmi.yaml +++ b/docker/services/ceilometer-agent-ipmi.yaml @@ -92,6 +92,8 @@ outputs: net: host privileged: false restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/ceilometer-agent-notification.yaml b/docker/services/ceilometer-agent-notification.yaml index 6c4951317c..dcc3822768 100644 --- a/docker/services/ceilometer-agent-notification.yaml +++ b/docker/services/ceilometer-agent-notification.yaml @@ -100,6 +100,8 @@ outputs: net: host privileged: false restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/cinder-api.yaml b/docker/services/cinder-api.yaml index e5fff3dd34..65092f7846 100644 --- a/docker/services/cinder-api.yaml +++ b/docker/services/cinder-api.yaml @@ -168,8 +168,6 @@ outputs: user: root privileged: false restart: always - healthcheck: - test: /bin/true volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/cinder-backup.yaml b/docker/services/cinder-backup.yaml index 53febdb517..440695e382 100644 --- a/docker/services/cinder-backup.yaml +++ b/docker/services/cinder-backup.yaml @@ -115,6 +115,8 @@ outputs: net: host privileged: false restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/cinder-scheduler.yaml b/docker/services/cinder-scheduler.yaml index fa9d24183e..40e46795eb 100644 --- a/docker/services/cinder-scheduler.yaml +++ b/docker/services/cinder-scheduler.yaml @@ -102,6 +102,8 @@ outputs: net: host privileged: false restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/cinder-volume.yaml b/docker/services/cinder-volume.yaml index 88e7712f2a..2d1c62cdf3 100644 --- a/docker/services/cinder-volume.yaml +++ b/docker/services/cinder-volume.yaml @@ -124,6 +124,8 @@ outputs: net: host privileged: true restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/database/mysql.yaml b/docker/services/database/mysql.yaml index c434ab76c0..3f4a639d0e 100644 --- a/docker/services/database/mysql.yaml +++ b/docker/services/database/mysql.yaml @@ -173,6 +173,8 @@ outputs: image: *mysql_image restart: always net: host + healthcheck: + test: /openstack/healthcheck volumes: *mysql_volumes environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS diff --git a/docker/services/glance-api.yaml b/docker/services/glance-api.yaml index 6713088c87..37acdd91a1 100644 --- a/docker/services/glance-api.yaml +++ b/docker/services/glance-api.yaml @@ -169,6 +169,8 @@ outputs: net: host privileged: false restart: always + healthcheck: + test: /openstack/healthcheck volumes: *glance_volumes environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS diff --git a/docker/services/heat-api-cfn.yaml b/docker/services/heat-api-cfn.yaml index 84bc0672e8..5d9b906bc7 100644 --- a/docker/services/heat-api-cfn.yaml +++ b/docker/services/heat-api-cfn.yaml @@ -102,6 +102,8 @@ outputs: # NOTE(mandre) kolla image changes the user to 'heat', we need it # to be root to run httpd user: root + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/heat-api.yaml b/docker/services/heat-api.yaml index dcba519f78..45b3d91a5a 100644 --- a/docker/services/heat-api.yaml +++ b/docker/services/heat-api.yaml @@ -113,6 +113,8 @@ outputs: # NOTE(mandre) kolla image changes the user to 'heat', we need it # to be root to run httpd user: root + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} @@ -139,8 +141,6 @@ outputs: user: root privileged: false restart: always - healthcheck: - test: /bin/true volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/heat-engine.yaml b/docker/services/heat-engine.yaml index 21ae24267b..5dc6deb884 100644 --- a/docker/services/heat-engine.yaml +++ b/docker/services/heat-engine.yaml @@ -120,6 +120,8 @@ outputs: net: host privileged: false restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/ironic-api.yaml b/docker/services/ironic-api.yaml index 156e5f9832..1c315cffdd 100644 --- a/docker/services/ironic-api.yaml +++ b/docker/services/ironic-api.yaml @@ -124,6 +124,8 @@ outputs: net: host user: root restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/ironic-conductor.yaml b/docker/services/ironic-conductor.yaml index 465aa8b177..b7d591a6ec 100644 --- a/docker/services/ironic-conductor.yaml +++ b/docker/services/ironic-conductor.yaml @@ -108,6 +108,8 @@ outputs: net: host privileged: true restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/ironic-pxe.yaml b/docker/services/ironic-pxe.yaml index 878eef6376..20d2a44651 100644 --- a/docker/services/ironic-pxe.yaml +++ b/docker/services/ironic-pxe.yaml @@ -83,6 +83,8 @@ outputs: net: host privileged: false restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml index a8ba5bf17d..019213619e 100644 --- a/docker/services/keystone.yaml +++ b/docker/services/keystone.yaml @@ -162,6 +162,8 @@ outputs: net: host privileged: false restart: always + healthcheck: + test: /openstack/healthcheck volumes: *keystone_volumes environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS @@ -179,8 +181,6 @@ 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/manila-scheduler.yaml b/docker/services/manila-scheduler.yaml index 931ce23dda..24010c449e 100644 --- a/docker/services/manila-scheduler.yaml +++ b/docker/services/manila-scheduler.yaml @@ -91,6 +91,8 @@ outputs: image: {get_param: DockerManilaSchedulerImage} net: host restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/mistral-engine.yaml b/docker/services/mistral-engine.yaml index 12f7779b20..6e0bdc3c87 100644 --- a/docker/services/mistral-engine.yaml +++ b/docker/services/mistral-engine.yaml @@ -97,6 +97,8 @@ outputs: net: host privileged: false restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/mistral-executor.yaml b/docker/services/mistral-executor.yaml index 0ee7d534a2..7c24b12ca4 100644 --- a/docker/services/mistral-executor.yaml +++ b/docker/services/mistral-executor.yaml @@ -97,6 +97,8 @@ outputs: net: host privileged: false restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/neutron-dhcp.yaml b/docker/services/neutron-dhcp.yaml index 4b5a27111d..0cfbc9bec4 100644 --- a/docker/services/neutron-dhcp.yaml +++ b/docker/services/neutron-dhcp.yaml @@ -94,6 +94,8 @@ outputs: pid: host privileged: true restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/neutron-l3.yaml b/docker/services/neutron-l3.yaml index 09232c2682..2ab7206c6d 100644 --- a/docker/services/neutron-l3.yaml +++ b/docker/services/neutron-l3.yaml @@ -90,6 +90,8 @@ outputs: pid: host privileged: true restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/neutron-metadata.yaml b/docker/services/neutron-metadata.yaml index 9fe839e9dd..b79789ac4a 100644 --- a/docker/services/neutron-metadata.yaml +++ b/docker/services/neutron-metadata.yaml @@ -90,6 +90,8 @@ outputs: pid: host privileged: true restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/neutron-ovs-agent.yaml b/docker/services/neutron-ovs-agent.yaml index 246008c5a8..8888c8480c 100644 --- a/docker/services/neutron-ovs-agent.yaml +++ b/docker/services/neutron-ovs-agent.yaml @@ -118,6 +118,8 @@ outputs: pid: host privileged: true restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml index e9e2ceabb3..46ba122dcf 100644 --- a/docker/services/nova-api.yaml +++ b/docker/services/nova-api.yaml @@ -175,6 +175,8 @@ outputs: user: root privileged: true restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} @@ -201,8 +203,6 @@ outputs: user: root privileged: false restart: always - healthcheck: - test: /bin/true volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml index c48467132d..af1cc0b27d 100644 --- a/docker/services/nova-compute.yaml +++ b/docker/services/nova-compute.yaml @@ -115,6 +115,8 @@ outputs: privileged: true user: nova restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/nova-conductor.yaml b/docker/services/nova-conductor.yaml index 56275b0274..fa5097764c 100644 --- a/docker/services/nova-conductor.yaml +++ b/docker/services/nova-conductor.yaml @@ -98,6 +98,8 @@ outputs: net: host privileged: false restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/nova-consoleauth.yaml b/docker/services/nova-consoleauth.yaml index 85078f14c9..407a31d8db 100644 --- a/docker/services/nova-consoleauth.yaml +++ b/docker/services/nova-consoleauth.yaml @@ -94,6 +94,8 @@ outputs: net: host privileged: false restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml index 1bed40ec16..a74b18d4d4 100644 --- a/docker/services/nova-ironic.yaml +++ b/docker/services/nova-ironic.yaml @@ -100,6 +100,8 @@ outputs: privileged: true user: root restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/nova-scheduler.yaml b/docker/services/nova-scheduler.yaml index e75df9427b..a4eb46f24b 100644 --- a/docker/services/nova-scheduler.yaml +++ b/docker/services/nova-scheduler.yaml @@ -94,6 +94,8 @@ outputs: net: host privileged: false restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/nova-vnc-proxy.yaml b/docker/services/nova-vnc-proxy.yaml index f1bb0eba8d..2731d6dff6 100644 --- a/docker/services/nova-vnc-proxy.yaml +++ b/docker/services/nova-vnc-proxy.yaml @@ -94,6 +94,8 @@ outputs: net: host privileged: false restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/octavia-health-manager.yaml b/docker/services/octavia-health-manager.yaml index 38c4faf039..7a4aed5a55 100644 --- a/docker/services/octavia-health-manager.yaml +++ b/docker/services/octavia-health-manager.yaml @@ -98,6 +98,8 @@ outputs: net: host privileged: false restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/octavia-housekeeping.yaml b/docker/services/octavia-housekeeping.yaml index 64e4f4806f..0efbadf494 100644 --- a/docker/services/octavia-housekeeping.yaml +++ b/docker/services/octavia-housekeeping.yaml @@ -98,6 +98,8 @@ outputs: net: host privileged: false restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/octavia-worker.yaml b/docker/services/octavia-worker.yaml index e00f6bb829..7340206a9c 100644 --- a/docker/services/octavia-worker.yaml +++ b/docker/services/octavia-worker.yaml @@ -98,6 +98,8 @@ outputs: net: host privileged: false restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/opendaylight-api.yaml b/docker/services/opendaylight-api.yaml index dbe49e9be1..95be508d8b 100644 --- a/docker/services/opendaylight-api.yaml +++ b/docker/services/opendaylight-api.yaml @@ -93,6 +93,8 @@ outputs: detach: true user: odl restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} @@ -116,4 +118,4 @@ outputs: upgrade_tasks: - name: Stop and disable opendaylight_api service tags: step2 - service: name=opendaylight state=stopped enabled=no \ No newline at end of file + service: name=opendaylight state=stopped enabled=no diff --git a/docker/services/rabbitmq.yaml b/docker/services/rabbitmq.yaml index 632bdc29cd..6d934561b9 100644 --- a/docker/services/rabbitmq.yaml +++ b/docker/services/rabbitmq.yaml @@ -175,6 +175,8 @@ outputs: net: host privileged: false restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/sahara-engine.yaml b/docker/services/sahara-engine.yaml index 088411601f..9705d98b54 100644 --- a/docker/services/sahara-engine.yaml +++ b/docker/services/sahara-engine.yaml @@ -98,6 +98,8 @@ outputs: net: host privileged: false restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/sensu-client.yaml b/docker/services/sensu-client.yaml index b64231cd6a..897d140d9f 100644 --- a/docker/services/sensu-client.yaml +++ b/docker/services/sensu-client.yaml @@ -125,6 +125,8 @@ outputs: # "docker inspect" command user: root restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/swift-proxy.yaml b/docker/services/swift-proxy.yaml index 2d745f7b57..03a8c96a57 100644 --- a/docker/services/swift-proxy.yaml +++ b/docker/services/swift-proxy.yaml @@ -103,6 +103,8 @@ outputs: net: host user: swift restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml index 108a036834..123557d97f 100644 --- a/docker/services/swift-storage.yaml +++ b/docker/services/swift-storage.yaml @@ -257,6 +257,8 @@ outputs: net: host user: swift restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} @@ -321,6 +323,8 @@ outputs: net: host user: swift restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} @@ -401,6 +405,8 @@ outputs: net: host user: swift restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]}