openstack/kolla
Code Issues Proposed changes

added simple health check scripts

Browse Source 
add /check.sh to keystone and glance-api images that can be used to
verify proper functionality of the container.

Change-Id: I0a878678fb8e9427d8e99af4896cbc679d3490a4
This commit is contained in:
Lars Kellogg-Stedman 2014-10-10 13:37:12 -04:00
parent ecdd5e1c8e
commit f593541485
6 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/glance/glance-api/Dockerfile
View File

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

17
docker/glance/glance-api/check.sh Executable file
View File

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

13
docker/glance/glance-base/config-glance.sh
View File

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

1
docker/keystone/Dockerfile
View File

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

12
docker/keystone/check.sh Executable file
View File

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

7
docker/keystone/start.sh
View File

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