aboutsummaryrefslogtreecommitdiff
path: root/docker/glance/glance-api
diff options
context:
space:
mode:
authorLars Kellogg-Stedman <lars@redhat.com>2014-10-10 11:45:33 -0400
committerLars Kellogg-Stedman <lars@redhat.com>2014-10-13 14:41:37 -0400
commit165307eb663b5d8f35d8c5bf7578dc03a0fa1e00 (patch)
tree92a8b01de72e19e5298b7f8abb4b8a0d47dc9572 /docker/glance/glance-api
parenta19e1cdd00f0b3394f9146eab8cb7f7fe2b6e0f2 (diff)
downloadkolla-165307eb663b5d8f35d8c5bf7578dc03a0fa1e00.tar.gz
kolla-165307eb663b5d8f35d8c5bf7578dc03a0fa1e00.zip
glance: cleanup; use kolla-common; exit on errors
cause glance start.sh scripts to exit on any errors (allowing kubernetes to reschedule the pod). Change-Id: Ibebbf47758a1dfc241cb04cdb12e44af77f92b55
Diffstat (limited to 'docker/glance/glance-api')
-rwxr-xr-xdocker/glance/glance-api/start.sh31
1 files changed, 16 insertions, 15 deletions
diff --git a/docker/glance/glance-api/start.sh b/docker/glance/glance-api/start.sh
index e0cc37d4f..c94db2ebc 100755
--- a/docker/glance/glance-api/start.sh
+++ b/docker/glance/glance-api/start.sh
@@ -1,28 +1,29 @@
#!/bin/sh
-if ! [ "$KEYSTONE_ADMIN_TOKEN" ]; then
- echo "*** Missing KEYSTONE_ADMIN_TOKEN" >&2
- exit 1
-fi
+set -e
-. /opt/glance/config-glance.sh
+. /opt/kolla/kolla-common.sh
+. /opt/kolla/config-glance.sh
-export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
-export SERVICE_ENDPOINT="http://${KEYSTONE_ADMIN_PORT_35357_TCP_ADDR}:35357/v2.0"
+check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \
+ GLANCE_KEYSTONE_USER GLANCE_KEYSTONE_PASSWORD \
+ ADMIN_TENANT_NAME GLANCE_API_SERVICE_HOST \
+ PUBLIC_IP
+check_for_keystone
-while ! curl -o /dev/null -s --fail ${SERVICE_ENDPOINT}; do
- echo "waiting for keystone..."
- sleep 1;
-done
+export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
+export SERVICE_ENDPOINT="http://${KEYSTONE_ADMIN_SERVICE_HOST}:35357/v2.0"
-crux user-create --update -n "${GLANCE_KEYSTONE_USER}" \
+crux user-create --update \
+ -n "${GLANCE_KEYSTONE_USER}" \
-p "${GLANCE_KEYSTONE_PASSWORD}" \
-t "${ADMIN_TENANT_NAME}" \
-r admin
-crux endpoint-create --remove-all -n glance -t image \
- -I "http://${GLANCE_API_PORT_9292_TCP_ADDR}:9292" \
+crux endpoint-create --remove-all \
+ -n glance -t image \
+ -I "http://${GLANCE_API_SERVICE_HOST}:9292" \
-P "http://${PUBLIC_IP}:9292" \
- -A "http://${GLANCE_API_PORT_9292_TCP_ADDR}:9292"
+ -A "http://${GLANCE_API_SERVICE_HOST}:9292"
exec /usr/bin/glance-api