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

@@ -96,6 +96,8 @@ outputs:
             net: host
             privileged: false
             restart: always
+            healthcheck:
+              test: /openstack/healthcheck
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -118,6 +118,8 @@ outputs:
             pid: host
             privileged: true
             restart: always
+            healthcheck:
+              test: /openstack/healthcheck
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}

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

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

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

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

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

@@ -94,6 +94,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

@@ -94,6 +94,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

@@ -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-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

@@ -98,6 +98,8 @@ outputs:
             net: host
             privileged: false
             restart: always
+            healthcheck:
+              test: /openstack/healthcheck
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}

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

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

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