diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-13 13:50:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-13 13:50:18 +0000 |
| commit | fa9492e6c65648706998580f10a71976eab4af30 (patch) | |
| tree | 6307a6dbd6468cb845698fa50021b260ec975bf2 /docker | |
| parent | 4a41f12ad7ca2e0c0231d058d0da3a290ca643e8 (diff) | |
| parent | a2e1254a889cd8c4943ceb0b59405554876c98d4 (diff) | |
| download | kolla-fa9492e6c65648706998580f10a71976eab4af30.tar.gz kolla-fa9492e6c65648706998580f10a71976eab4af30.zip | |
Merge "Removed config-internal check.sh for cinder"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/centos/binary/cinder/cinder-api/Dockerfile | 3 | ||||
| l--------- | docker/centos/binary/cinder/cinder-api/check.sh | 1 | ||||
| -rw-r--r-- | docker/centos/source/cinder/cinder-api/Dockerfile | 2 | ||||
| l--------- | docker/centos/source/cinder/cinder-api/check.sh | 1 | ||||
| -rwxr-xr-x | docker/common/cinder/cinder-api/check.sh | 16 |
5 files changed, 3 insertions, 20 deletions
diff --git a/docker/centos/binary/cinder/cinder-api/Dockerfile b/docker/centos/binary/cinder/cinder-api/Dockerfile index 98899a79b..7eed0b311 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 50260e7b1..000000000 --- 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 3ce612046..99200d910 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 50260e7b1..000000000 --- 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 57b88f566..000000000 --- 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 |