aboutsummaryrefslogtreecommitdiff
path: root/docker/common/glance
diff options
context:
space:
mode:
Diffstat (limited to 'docker/common/glance')
-rwxr-xr-xdocker/common/glance/glance-registry/start.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/docker/common/glance/glance-registry/start.sh b/docker/common/glance/glance-registry/start.sh
index 5f590fb1c..6b12d8fee 100755
--- a/docker/common/glance/glance-registry/start.sh
+++ b/docker/common/glance/glance-registry/start.sh
@@ -5,17 +5,20 @@ set -e
. /opt/kolla/kolla-common.sh
. /opt/kolla/config-glance.sh
-check_required_vars GLANCE_DB_NAME GLANCE_DB_USER GLANCE_DB_PASSWORD
+check_required_vars GLANCE_DB_NAME GLANCE_DB_USER GLANCE_DB_PASSWORD \
+ INIT_GLANCE_DB
# lets wait for the DB to be available
wait_for 25 1 check_for_db
-mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF
+if [ "${INIT_GLANCE_DB}" == "true" ]; then
+ mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF
CREATE DATABASE IF NOT EXISTS ${GLANCE_DB_NAME} DEFAULT CHARACTER SET utf8;
GRANT ALL PRIVILEGES ON ${GLANCE_DB_NAME}.* TO
'${GLANCE_DB_USER}'@'%' IDENTIFIED BY '${GLANCE_DB_PASSWORD}'
EOF
-/usr/bin/glance-manage db_sync
+ /usr/bin/glance-manage db_sync
+fi
exec /usr/bin/glance-registry