diff options
| author | Lars Kellogg-Stedman <lars@redhat.com> | 2014-10-10 13:37:12 -0400 |
|---|---|---|
| committer | Lars Kellogg-Stedman <lars@redhat.com> | 2014-10-13 16:43:13 -0400 |
| commit | f5935414855ad8bbe3abe51020e7d92965938cec (patch) | |
| tree | e1a1f3a9b616fe7291ce6dc6d24d0115cd67aaf1 /docker | |
| parent | ecdd5e1c8e7ca14d827f8bbd7ec8982969435fed (diff) | |
| download | kolla-f5935414855ad8bbe3abe51020e7d92965938cec.tar.gz kolla-f5935414855ad8bbe3abe51020e7d92965938cec.zip | |
added simple health check scripts
add /check.sh to keystone and glance-api images that can be used to
verify proper functionality of the container.
Change-Id: I0a878678fb8e9427d8e99af4896cbc679d3490a4
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/glance/glance-api/Dockerfile | 2 | ||||
| -rwxr-xr-x | docker/glance/glance-api/check.sh | 17 | ||||
| -rw-r--r-- | docker/glance/glance-base/config-glance.sh | 13 | ||||
| -rw-r--r-- | docker/keystone/Dockerfile | 1 | ||||
| -rwxr-xr-x | docker/keystone/check.sh | 12 | ||||
| -rwxr-xr-x | docker/keystone/start.sh | 7 |
6 files changed, 46 insertions, 6 deletions
diff --git a/docker/glance/glance-api/Dockerfile b/docker/glance/glance-api/Dockerfile index dcc1b47db..13c5b5684 100644 --- a/docker/glance/glance-api/Dockerfile +++ b/docker/glance/glance-api/Dockerfile @@ -2,4 +2,6 @@ FROM kollaglue/fedora-rdo-glance-base MAINTAINER Dan Radez <dradez@redhat.com> ADD ./start.sh /start.sh +ADD ./check.sh /check.sh + CMD ["/start.sh"] diff --git a/docker/glance/glance-api/check.sh b/docker/glance/glance-api/check.sh new file mode 100755 index 000000000..63c265464 --- /dev/null +++ b/docker/glance/glance-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 ! glance image-list > /dev/null; then + echo "ERROR: glance image-list failed" >&2 + RES=1 + fi +fi + +exit $RES + diff --git a/docker/glance/glance-base/config-glance.sh b/docker/glance/glance-base/config-glance.sh index 2868d31c0..b260ed7e9 100644 --- a/docker/glance/glance-base/config-glance.sh +++ b/docker/glance/glance-base/config-glance.sh @@ -55,9 +55,10 @@ for cfg in /etc/glance/glance-api.conf /etc/glance/glance-registry.conf; do "mysql://${GLANCE_DB_USER}:${GLANCE_DB_PASSWORD}@${MARIADB_SERVICE_HOST}/${GLANCE_DB_NAME}" done -for cfg in /etc/glance/glance-api.conf; do - crudini --set $cfg \ - DEFAULT \ - registry_host \ - $MY_IP -done +cat > /openrc <<EOF +export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0" +export OS_USERNAME=glance +export OS_PASSWORD="${GLANCE_KEYSTONE_PASSWORD}" +export OS_TENANT_NAME=${ADMIN_TENANT_NAME} +EOF + diff --git a/docker/keystone/Dockerfile b/docker/keystone/Dockerfile index 3192d30ba..4a71d2282 100644 --- a/docker/keystone/Dockerfile +++ b/docker/keystone/Dockerfile @@ -11,6 +11,7 @@ RUN yum install -y openstack-keystone \ ; yum clean all ADD ./start.sh /start.sh +ADD ./check.sh /check.sh EXPOSE 5000 35357 diff --git a/docker/keystone/check.sh b/docker/keystone/check.sh new file mode 100755 index 000000000..f96793861 --- /dev/null +++ b/docker/keystone/check.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +RES=0 + +. /openrc +if ! keystone token-get > /dev/null; then + echo "ERROR: keystone token-get failed" >&2 + RES=1 +fi + +exit $RES + diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh index aa90cc092..fc01db694 100755 --- a/docker/keystone/start.sh +++ b/docker/keystone/start.sh @@ -33,6 +33,13 @@ crudini --del /etc/keystone/keystone.conf \ log_dir crudini --set /etc/keystone/keystone.conf DEFAULT use_stderr True +cat > /openrc <<EOF +export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0" +export OS_USERNAME=admin +export OS_PASSWORD="${KEYSTONE_ADMIN_PASSWORD}" +export OS_TENANT_NAME=${ADMIN_TENANT_NAME} +EOF + /usr/bin/keystone-manage db_sync /usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone |