Merge "Explicitly set healthcheck command."

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]}

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]}

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]}

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]}

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]}

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]}

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]}

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]}

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]}

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]}

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

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

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]}

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]}

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]}

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]}

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]}

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]}

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]}

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]}

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]}

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]}

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]}

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]}

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]}

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]}

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]}

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]}

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]}

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]}

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]}

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]}

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]}

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]}

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]}

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]}

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
+          service: name=opendaylight state=stopped enabled=no

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]}

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]}

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]}

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]}

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]}