Merge "Removed config-internal check.sh for cinder"

docker/centos/binary/cinder/cinder-api/Dockerfile

@@ -2,7 +2,8 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%%
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 RUN yum install -y python-keystone && yum clean all
+
+COPY start.sh /
 COPY config-external.sh /opt/kolla/
-COPY ./start.sh ./check.sh /
 
 CMD ["/start.sh"]

docker/centos/binary/cinder/cinder-api/check.sh

@@ -1 +0,0 @@
-../../../../common/cinder/cinder-api/check.sh

docker/centos/source/cinder/cinder-api/Dockerfile

@@ -3,7 +3,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 RUN pip install python-keystoneclient
 
+COPY start.sh /
 COPY config-external.sh /opt/kolla/
-COPY ./start.sh ./check.sh /
 
 CMD ["/start.sh"]

docker/centos/source/cinder/cinder-api/check.sh

@@ -1 +0,0 @@
-../../../../common/cinder/cinder-api/check.sh

docker/common/cinder/cinder-api/check.sh

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-RES=0
-
-. /openrc
-if ! keystone token-get > /dev/null; then
-    echo "ERROR: keystone token-get failed" >&2
-    RES=1
-else
-    if ! cinder list > /dev/null; then
-        echo "ERROR: cinder list failed" >&2
-        RES=1
-    fi
-fi
-
-exit $RES