From e7a7cc90178dcc3249e2d444e56c0415fc6ff5c1 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Sat, 4 Jul 2015 12:47:45 +0000 Subject: Ansible Glance support Adds support for glance in ansible Partially-Implements: blueprint ansible-service Change-Id: I2d162e79f85877116b0e33b1843de6ccb62a445a --- docker/common/glance/glance-api/start.sh | 7 +++++++ docker/common/glance/glance-registry/start.sh | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'docker') diff --git a/docker/common/glance/glance-api/start.sh b/docker/common/glance/glance-api/start.sh index 152fb019f..26db7fc1c 100755 --- a/docker/common/glance/glance-api/start.sh +++ b/docker/common/glance/glance-api/start.sh @@ -10,4 +10,11 @@ source /opt/kolla/kolla-common.sh # Config-internal script exec out of this function, it does not return here. set_configs +# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases +# of the KOLLA_BOOTSTRAP variable being set, including empty. +if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then + su -s /bin/sh -c "glance-manage db_sync" glance + exit 0 +fi + exec $CMD $ARGS diff --git a/docker/common/glance/glance-registry/start.sh b/docker/common/glance/glance-registry/start.sh index e77232cf7..70899985e 100755 --- a/docker/common/glance/glance-registry/start.sh +++ b/docker/common/glance/glance-registry/start.sh @@ -10,11 +10,4 @@ source /opt/kolla/kolla-common.sh # Config-internal script exec out of this function, it does not return here. set_configs -# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases -# of the KOLLA_BOOTSTRAP variable being set, including empty. -if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - su -s /bin/sh -c "glance-manage db_sync" glance - exit 0 -fi - exec $CMD $ARGS -- cgit v1.2.3