5 files changed, 24 insertions, 15 deletions
diff --git a/docker/common/designate/designate-central/start.sh b/docker/common/designate/designate-central/start.sh
index fef7e2353..44cf89130 100755
--- a/docker/common/designate/designate-central/start.sh
+++ b/docker/common/designate/designate-central/start.sh
@@ -5,13 +5,13 @@ set -e
 . /opt/kolla/config-designate.sh
 
 check_required_vars MARIADB_SERVICE_HOST DB_ROOT_PASSWORD DESIGNATE_DB_NAME \
-                    DESIGNATE_DB_USER DESIGNATE_DB_PASSWORD DESIGNATE_INITDB
+                    DESIGNATE_DB_USER DESIGNATE_DB_PASSWORD INIT_DESIGNATE_DB
 
 fail_unless_db
 
 CONF=/etc/designate/designate.conf
 
-if [ "${DESIGNATE_INITDB}" == "true" ]; then
+if [ "${INIT_DESIGNATE_DB}" == "true" ]; then
     echo "Configuring database"
     mysql -h ${MARIADB_SERVICE_HOST} -u root -p"${DB_ROOT_PASSWORD}" mysql <<EOF
 CREATE DATABASE IF NOT EXISTS ${DESIGNATE_DB_NAME};
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
diff --git a/docker/common/heat/heat-engine/start.sh b/docker/common/heat/heat-engine/start.sh
index 2dfc78e92..531b69375 100755
--- a/docker/common/heat/heat-engine/start.sh
+++ b/docker/common/heat/heat-engine/start.sh
@@ -3,15 +3,18 @@
 . /opt/kolla/kolla-common.sh
 . /opt/kolla/config-heat.sh
 
-check_required_vars HEAT_DB_NAME HEAT_DB_USER HEAT_DB_PASSWORD
+check_required_vars HEAT_DB_NAME HEAT_DB_USER HEAT_DB_PASSWORD \
+                    INIT_HEAT_DB
 fail_unless_db
 
-mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF
+if [ "${INIT_HEAT_DB}" == "true" ]; then
+    mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF
 CREATE DATABASE IF NOT EXISTS ${HEAT_DB_NAME} DEFAULT CHARACTER SET utf8;
 GRANT ALL PRIVILEGES ON ${HEAT_DB_NAME}.* TO
     '${HEAT_DB_USER}'@'%' IDENTIFIED BY '${HEAT_DB_PASSWORD}'
 EOF
 
-/usr/bin/heat-manage db_sync
+    /usr/bin/heat-manage db_sync
+fi
 
 exec /usr/bin/heat-engine
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
 
diff --git a/docker/common/nova-controller/nova-conductor/start.sh b/docker/common/nova-controller/nova-conductor/start.sh
index 575e7ff6c..3bba8cf3a 100755
--- a/docker/common/nova-controller/nova-conductor/start.sh
+++ b/docker/common/nova-controller/nova-conductor/start.sh
@@ -4,7 +4,8 @@ set -e
 
 . /opt/kolla/config-nova.sh
 
-check_required_vars NOVA_DB_NAME NOVA_DB_USER NOVA_DB_PASSWORD
+check_required_vars NOVA_DB_NAME NOVA_DB_USER NOVA_DB_PASSWORD \
+                    INIT_NOVA_DB
 fail_unless_db
 
 cfg=/etc/nova/nova.conf
@@ -12,12 +13,14 @@ cfg=/etc/nova/nova.conf
 # configure logging
 crudini --set $cfg DEFAULT log_file "${NOVA_CONDUCTOR_LOG_FILE}"
 
-mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF
+if [ "${INIT_NOVA_DB}" == "true" ]; then
+    mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF
 CREATE DATABASE IF NOT EXISTS ${NOVA_DB_NAME};
 GRANT ALL PRIVILEGES ON ${NOVA_DB_NAME}.* TO
-	'${NOVA_DB_USER}'@'%' IDENTIFIED BY '${NOVA_DB_PASSWORD}'
+       '${NOVA_DB_USER}'@'%' IDENTIFIED BY '${NOVA_DB_PASSWORD}'
 EOF
 
-nova-manage db sync
+    nova-manage db sync
+fi
 
 exec /usr/bin/nova-conductor --config-file /etc/nova/nova.conf