Merge "Fix missing healthcheck script for manila-api/share"

container-images/tcib/base/os/manila-base/manila-api/manila-api.yaml

@@ -2,6 +2,7 @@ tcib_actions:
 - run: dnf -y install {{ tcib_packages.common | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
 - run: mkdir -p /var/www/cgi-bin/manila && cp -a /usr/bin/manila-wsgi /var/www/cgi-bin/manila/manila-wsgi && sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
 - run: chown -R manila /var/www/cgi-bin/manila && chmod 755 /var/www/cgi-bin/manila/manila-wsgi
+- run: ln -s /usr/share/openstack-tripleo-common/healthcheck/manila-api /openstack/healthcheck && chmod a+rx /openstack/healthcheck
 tcib_packages:
   common:
   - httpd

container-images/tcib/base/os/manila-base/manila-share/manila-share.yaml

@@ -1,6 +1,7 @@
 tcib_actions:
 - run: dnf -y install {{ tcib_packages.common | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
 - run: mkdir -p /etc/libqb
+- run: ln -s /usr/share/openstack-tripleo-common/healthcheck/manila-api /openstack/healthcheck && chmod a+rx /openstack/healthcheck
 tcib_packages:
   common:
   - ceph-common

healthcheck/manila-api

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
+
+check_url=$(get_url_from_vhost /etc/httpd/conf.d/10-manila_wsgi.conf)
+healthcheck_curl ${check_url}

healthcheck/manila-share

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
+
+process='manila-share'
+args="${@:-5671 5672}"
+
+if healthcheck_port $process $args; then
+    exit 0
+else
+    ports=${args// /,}
+    echo "There is no $process process with opened RabbitMQ ports ($ports) running in the container"
+    exit 1
+fi