Merge "Enable health check for OVN containers" into stable/rocky

docker/services/ovn-controller.yaml

@@ -108,6 +108,15 @@ outputs:
             privileged: true
             user: root
             restart: always
+            healthcheck:
+              test:
+                list_join:
+                  - ' '
+                  - - '/openstack/healthcheck'
+                    - yaql:
+                        expression: str($.data.port)
+                        data:
+                          port: {get_attr: [OvnControllerBase, role_data, config_settings, 'ovn::southbound::port']}
             volumes:
               - /var/lib/kolla/config_files/ovn_controller.json:/var/lib/kolla/config_files/config.json:ro
               - /lib/modules:/lib/modules:ro

docker/services/ovn-dbs.yaml

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