diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-16 20:53:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-16 20:53:50 +0000 |
| commit | a3b90f59f1a1a2ebffa026003aa36ea80897d6ce (patch) | |
| tree | ceb3206eb8409ede8b367c0514ba8baf1cc33752 /docker/nova-controller | |
| parent | b5a164900fa5ac050e2742b50258f99b2454588c (diff) | |
| parent | b1a2d744061a2e85dfb0a366b0cc16c284cf9a5f (diff) | |
| download | kolla-a3b90f59f1a1a2ebffa026003aa36ea80897d6ce.tar.gz kolla-a3b90f59f1a1a2ebffa026003aa36ea80897d6ce.zip | |
Merge "add /check.sh script to nova-api image"
Diffstat (limited to 'docker/nova-controller')
| -rw-r--r-- | docker/nova-controller/nova-api/Dockerfile | 2 | ||||
| -rwxr-xr-x | docker/nova-controller/nova-api/check.sh | 17 |
2 files changed, 19 insertions, 0 deletions
diff --git a/docker/nova-controller/nova-api/Dockerfile b/docker/nova-controller/nova-api/Dockerfile index 23e4c076f..cfde6ce10 100644 --- a/docker/nova-controller/nova-api/Dockerfile +++ b/docker/nova-controller/nova-api/Dockerfile @@ -7,4 +7,6 @@ RUN yum -y install \ EXPOSE 8773 8774 8775 ADD ./start.sh /start.sh +ADD ./check.sh /check.sh + CMD ["/start.sh"] diff --git a/docker/nova-controller/nova-api/check.sh b/docker/nova-controller/nova-api/check.sh new file mode 100755 index 000000000..a738b1002 --- /dev/null +++ b/docker/nova-controller/nova-api/check.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +RES=0 + +. /openrc +if ! keystone token-get > /dev/null; then + echo "ERROR: keystone token-get failed" >&2 + RES=1 +else + if ! nova list > /dev/null; then + echo "ERROR: nova list failed" >&2 + RES=1 + fi +fi + +exit $RES + |