openstack/kolla-ansible
Code Issues Proposed changes

Removed config-internal check.sh for cinder

Browse Source 
Change-Id: I6c83459f67713842886b24b173f73108596beaa4
Partially-Implements: blueprint remove-config-internal
This commit is contained in:
Sam Yaple 2015-08-13 10:17:24 +00:00
parent 59a2d537e0
commit a2e1254a88
5 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/centos/binary/cinder/cinder-api/Dockerfile
View File

@ -2,7 +2,8 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y python-keystone && yum clean all RUN yum install -y python-keystone && yum clean all
COPY start.sh /
COPY config-external.sh /opt/kolla/ COPY config-external.sh /opt/kolla/
COPY ./start.sh ./check.sh /
CMD ["/start.sh"] CMD ["/start.sh"]

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

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

2
docker/centos/source/cinder/cinder-api/Dockerfile
View File

@ -3,7 +3,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN pip install python-keystoneclient RUN pip install python-keystoneclient
COPY start.sh /
COPY config-external.sh /opt/kolla/ COPY config-external.sh /opt/kolla/
COPY ./start.sh ./check.sh /
CMD ["/start.sh"] CMD ["/start.sh"]

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

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

16
docker/common/cinder/cinder-api/check.sh
View File

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