From 2dbde4ad8e2dfdc89701cae48a1fc77f5489ddda Mon Sep 17 00:00:00 2001
From: Ryan Hallisey <rhallise@redhat.com>
Date: Mon, 22 Jun 2015 15:29:54 -0400
Subject: Add option to not run db sync

Database syncs should not be required every time a container starts.
We can default database startup to true, but give the option
to set it to false.

Change-Id: Ib76876b2671f6c31f4511412efd3a438ec78f01f
Closes-bug: #1467576
---
 docker/common/glance/glance-registry/start.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'docker/common/glance')

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
-- 
cgit v1.2.3