openstack/kolla
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2015-08-12 20:07:36 +00:00 committed by Gerrit Code Review
commit 750d3fed20
5 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/centos/binary/glance/glance-api/Dockerfile
View File

@ -1,9 +1,7 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%% FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
COPY ./start.sh /start.sh COPY start.sh /
COPY ./check.sh /check.sh
COPY config-external.sh /opt/kolla/ COPY config-external.sh /opt/kolla/
CMD ["/start.sh"] CMD ["/start.sh"]

1
docker/centos/binary/glance/glance-api/check.sh
View File

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

3
docker/centos/source/glance/glance-api/Dockerfile
View File

@ -1,8 +1,7 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%% FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
COPY start.sh check.sh / COPY start.sh /
COPY config-external.sh /opt/kolla/ COPY config-external.sh /opt/kolla/
CMD ["/start.sh"] CMD ["/start.sh"]

1
docker/centos/source/glance/glance-api/check.sh
View File

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

17
docker/common/glance/glance-api/check.sh
View File

@ -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