diff --git a/docker/centos/binary/cinder/cinder-api/Dockerfile b/docker/centos/binary/cinder/cinder-api/Dockerfile index 98899a79bf..7eed0b3117 100644 --- a/docker/centos/binary/cinder/cinder-api/Dockerfile +++ b/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"] diff --git a/docker/centos/binary/cinder/cinder-api/check.sh b/docker/centos/binary/cinder/cinder-api/check.sh deleted file mode 120000 index 50260e7b15..0000000000 --- a/docker/centos/binary/cinder/cinder-api/check.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/cinder/cinder-api/check.sh \ No newline at end of file diff --git a/docker/centos/source/cinder/cinder-api/Dockerfile b/docker/centos/source/cinder/cinder-api/Dockerfile index 3ce6120461..99200d9107 100644 --- a/docker/centos/source/cinder/cinder-api/Dockerfile +++ b/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"] diff --git a/docker/centos/source/cinder/cinder-api/check.sh b/docker/centos/source/cinder/cinder-api/check.sh deleted file mode 120000 index 50260e7b15..0000000000 --- a/docker/centos/source/cinder/cinder-api/check.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/cinder/cinder-api/check.sh \ No newline at end of file diff --git a/docker/common/cinder/cinder-api/check.sh b/docker/common/cinder/cinder-api/check.sh deleted file mode 100755 index 57b88f5669..0000000000 --- a/docker/common/cinder/cinder-api/check.sh +++ /dev/null @@ -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