diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-12 20:07:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-12 20:07:36 +0000 |
| commit | 750d3fed20bb1a14af1db7348f91c491fb473e34 (patch) | |
| tree | fa65582bb1c8109bfe20ebdd102e7ddcb7b47ace | |
| parent | 8ae3b0d67e92450adf2ae411d64d5710d7da3687 (diff) | |
| parent | 591dfb167f81757d7e721285eec1c37126327804 (diff) | |
| download | kolla-750d3fed20bb1a14af1db7348f91c491fb473e34.tar.gz kolla-750d3fed20bb1a14af1db7348f91c491fb473e34.zip | |
Merge "Removed config-internal check.sh for glance"
| -rw-r--r-- | docker/centos/binary/glance/glance-api/Dockerfile | 4 | ||||
| l--------- | docker/centos/binary/glance/glance-api/check.sh | 1 | ||||
| -rw-r--r-- | docker/centos/source/glance/glance-api/Dockerfile | 3 | ||||
| l--------- | docker/centos/source/glance/glance-api/check.sh | 1 | ||||
| -rwxr-xr-x | docker/common/glance/glance-api/check.sh | 17 |
5 files changed, 2 insertions, 24 deletions
diff --git a/docker/centos/binary/glance/glance-api/Dockerfile b/docker/centos/binary/glance/glance-api/Dockerfile index 34de0690e..c3c0fd9d1 100644 --- a/docker/centos/binary/glance/glance-api/Dockerfile +++ b/docker/centos/binary/glance/glance-api/Dockerfile @@ -1,9 +1,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) -COPY ./start.sh /start.sh -COPY ./check.sh /check.sh - +COPY start.sh / COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/glance/glance-api/check.sh b/docker/centos/binary/glance/glance-api/check.sh deleted file mode 120000 index 73dd5e253..000000000 --- a/docker/centos/binary/glance/glance-api/check.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/glance/glance-api/check.sh
\ No newline at end of file diff --git a/docker/centos/source/glance/glance-api/Dockerfile b/docker/centos/source/glance/glance-api/Dockerfile index 727feb0b7..c3c0fd9d1 100644 --- a/docker/centos/source/glance/glance-api/Dockerfile +++ b/docker/centos/source/glance/glance-api/Dockerfile @@ -1,8 +1,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) -COPY start.sh check.sh / - +COPY start.sh / COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/glance/glance-api/check.sh b/docker/centos/source/glance/glance-api/check.sh deleted file mode 120000 index 73dd5e253..000000000 --- a/docker/centos/source/glance/glance-api/check.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/glance/glance-api/check.sh
\ No newline at end of file diff --git a/docker/common/glance/glance-api/check.sh b/docker/common/glance/glance-api/check.sh deleted file mode 100755 index f97ef70f4..000000000 --- a/docker/common/glance/glance-api/check.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -RES=0 - -. /openrc -if ! keystone token-get > /dev/null; then - echo "ERROR: keystone token-get failed" >&2 - RES=1 -else - if ! glance image-list > /dev/null; then - echo "ERROR: glance image-list failed" >&2 - RES=1 - fi -fi - -exit $RES - |