From 591dfb167f81757d7e721285eec1c37126327804 Mon Sep 17 00:00:00 2001 From: Sam Yaple <sam@yaple.net> Date: Mon, 10 Aug 2015 00:26:11 +0000 Subject: [PATCH] Removed config-internal check.sh for glance Change-Id: Id16dd60c7ee29c953936cbe1b3a77a825af5083f Partially-Implements: blueprint remove-config-internal --- .../centos/binary/glance/glance-api/Dockerfile | 4 +--- docker/centos/binary/glance/glance-api/check.sh | 1 - .../centos/source/glance/glance-api/Dockerfile | 3 +-- docker/centos/source/glance/glance-api/check.sh | 1 - docker/common/glance/glance-api/check.sh | 17 ----------------- 5 files changed, 2 insertions(+), 24 deletions(-) delete mode 120000 docker/centos/binary/glance/glance-api/check.sh delete mode 120000 docker/centos/source/glance/glance-api/check.sh delete mode 100755 docker/common/glance/glance-api/check.sh diff --git a/docker/centos/binary/glance/glance-api/Dockerfile b/docker/centos/binary/glance/glance-api/Dockerfile index 34de0690ed..c3c0fd9d13 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 73dd5e2537..0000000000 --- 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 727feb0b7d..c3c0fd9d13 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 73dd5e2537..0000000000 --- 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 f97ef70f46..0000000000 --- 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 -