diff --git a/docker/services/aodh-evaluator.yaml b/docker/services/aodh-evaluator.yaml index fda6faa2e8..d5179739f8 100644 --- a/docker/services/aodh-evaluator.yaml +++ b/docker/services/aodh-evaluator.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/aodh-listener.yaml b/docker/services/aodh-listener.yaml index fbe86d3b03..f60eae211b 100644 --- a/docker/services/aodh-listener.yaml +++ b/docker/services/aodh-listener.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/aodh-notifier.yaml b/docker/services/aodh-notifier.yaml index d9081d547e..24635e6278 100644 --- a/docker/services/aodh-notifier.yaml +++ b/docker/services/aodh-notifier.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/ceilometer-agent-central.yaml b/docker/services/ceilometer-agent-central.yaml index 189d8b94ff..4cf6402a1c 100644 --- a/docker/services/ceilometer-agent-central.yaml +++ b/docker/services/ceilometer-agent-central.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-ipmi.yaml b/docker/services/ceilometer-agent-ipmi.yaml index 24ed42d3c0..4427bcf890 100644 --- a/docker/services/ceilometer-agent-ipmi.yaml +++ b/docker/services/ceilometer-agent-ipmi.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-notification.yaml b/docker/services/ceilometer-agent-notification.yaml index 9b2a243f37..330fd6fb77 100644 --- a/docker/services/ceilometer-agent-notification.yaml +++ b/docker/services/ceilometer-agent-notification.yaml @@ -104,6 +104,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 336b454021..7aba3918ba 100644 --- a/docker/services/cinder-api.yaml +++ b/docker/services/cinder-api.yaml @@ -172,8 +172,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 66877b5f77..d29bb0bc19 100644 --- a/docker/services/cinder-backup.yaml +++ b/docker/services/cinder-backup.yaml @@ -118,6 +118,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 1772f9e918..8c85b3e3dd 100644 --- a/docker/services/cinder-scheduler.yaml +++ b/docker/services/cinder-scheduler.yaml @@ -106,6 +106,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 46873ea812..4019b872f9 100644 --- a/docker/services/cinder-volume.yaml +++ b/docker/services/cinder-volume.yaml @@ -129,6 +129,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 aeba7d7a2b..7fe82c7ee6 100644 --- a/docker/services/database/mysql.yaml +++ b/docker/services/database/mysql.yaml @@ -189,6 +189,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 ff8bd20623..8264b5c5e2 100644 --- a/docker/services/glance-api.yaml +++ b/docker/services/glance-api.yaml @@ -182,6 +182,8 @@ outputs: net: host privileged: {if: [cinder_backend_enabled, true, 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 dcb482e342..ed5149acac 100644 --- a/docker/services/keystone.yaml +++ b/docker/services/keystone.yaml @@ -161,6 +161,8 @@ outputs: net: host privileged: false restart: always + healthcheck: + test: /openstack/healthcheck volumes: *keystone_volumes environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS @@ -178,8 +180,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 15dea43eb9..e2650797c4 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 e6faf34d19..58a691eff0 100644 --- a/docker/services/neutron-ovs-agent.yaml +++ b/docker/services/neutron-ovs-agent.yaml @@ -122,6 +122,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 b68474bef5..e2856e554d 100644 --- a/docker/services/nova-api.yaml +++ b/docker/services/nova-api.yaml @@ -174,6 +174,8 @@ outputs: user: root privileged: true restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} @@ -199,8 +201,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 5163a38146..45a4608060 100644 --- a/docker/services/nova-compute.yaml +++ b/docker/services/nova-compute.yaml @@ -120,6 +120,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 3d2b0600e8..4395333bf7 100644 --- a/docker/services/nova-conductor.yaml +++ b/docker/services/nova-conductor.yaml @@ -116,6 +116,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 4a2f6b6210..fa57dc2274 100644 --- a/docker/services/nova-consoleauth.yaml +++ b/docker/services/nova-consoleauth.yaml @@ -111,6 +111,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 45ecc80fab..7e20162d68 100644 --- a/docker/services/nova-scheduler.yaml +++ b/docker/services/nova-scheduler.yaml @@ -111,6 +111,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 b99e2fc18a..ac2e151b06 100644 --- a/docker/services/nova-vnc-proxy.yaml +++ b/docker/services/nova-vnc-proxy.yaml @@ -111,6 +111,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 5180e41636..e9babe313f 100644 --- a/docker/services/octavia-health-manager.yaml +++ b/docker/services/octavia-health-manager.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/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 237995b996..1d1978fdad 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 0a061bd340..7007a4ca5d 100644 --- a/docker/services/sahara-engine.yaml +++ b/docker/services/sahara-engine.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/sensu-client.yaml b/docker/services/sensu-client.yaml index a535af4656..6ad38a5576 100644 --- a/docker/services/sensu-client.yaml +++ b/docker/services/sensu-client.yaml @@ -129,6 +129,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 3a27ab8514..6d1a537512 100644 --- a/docker/services/swift-proxy.yaml +++ b/docker/services/swift-proxy.yaml @@ -107,6 +107,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 bdea10222e..d7088f67fa 100644 --- a/docker/services/swift-storage.yaml +++ b/docker/services/swift-storage.yaml @@ -263,6 +263,8 @@ outputs: net: host user: swift restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} @@ -327,6 +329,8 @@ outputs: net: host user: swift restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} @@ -407,6 +411,8 @@ outputs: net: host user: swift restart: always + healthcheck: + test: /openstack/healthcheck volumes: list_concat: - {get_attr: [ContainersCommon, volumes]}