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/keystone/start.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'docker/common/keystone')

diff --git a/docker/common/keystone/start.sh b/docker/common/keystone/start.sh
index ca9fb2266..2eb0f8c48 100755
--- a/docker/common/keystone/start.sh
+++ b/docker/common/keystone/start.sh
@@ -14,7 +14,7 @@ echo "Running the kolla-common script"
 : ${KEYSTONE_ADMIN_PASSWORD:=password}
 : ${KEYSTONE_ADMIN_TOKEN:=changeme}
 # DB Settings
-: ${INIT_DB:=true}
+: ${INIT_KEYSTONE_DB:=true}
 : ${KEYSTONE_DB_NAME:=keystone}
 : ${KEYSTONE_DB_USER:=keystone}
 : ${DB_ROOT_PASSWORD:=password}
@@ -42,7 +42,7 @@ echo "Checking for required variables"
 check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_DB_PASSWORD \
                     KEYSTONE_ADMIN_PASSWORD ADMIN_TENANT_NAME \
                     KEYSTONE_PUBLIC_SERVICE_HOST KEYSTONE_ADMIN_SERVICE_HOST \
-                    PUBLIC_IP
+                    PUBLIC_IP INIT_KEYSTONE_DB
 dump_vars
 
 # Setup the Keystone DB
@@ -126,7 +126,7 @@ chmod -R o-rwx /etc/keystone/ssl
 
 # Initialize the Keystone DB
 echo "Initializing Keystone DB"
-if [ "${INIT_DB}" == "true" ] ; then
+if [ "${INIT_KEYSTONE_DB}" == "true" ] ; then
     su -s /bin/bash -c "keystone-manage db_sync" keystone
 fi
 
-- 
cgit v1.2.3