From 282b9d2daa6d9129c46ec903d565d910512c2507 Mon Sep 17 00:00:00 2001
From: Ryan Hallisey <rhallise@redhat.com>
Date: Mon, 13 Oct 2014 23:18:55 +0000
Subject: [PATCH] Nova-api should not set up the database

Instead, nova-conductor will setup the database.

Change-Id: I91a46aa9bc3fc99fe58053b239929c8121864283
---
 docker/nova-controller/nova-api/start.sh | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/docker/nova-controller/nova-api/start.sh b/docker/nova-controller/nova-api/start.sh
index ed2c11109c..a8f077bc1b 100644
--- a/docker/nova-controller/nova-api/start.sh
+++ b/docker/nova-controller/nova-api/start.sh
@@ -22,15 +22,6 @@ if ! [ "$NOVA_DB_PASSWORD" ]; then
 	export NOVA_DB_PASSWORD
 fi
 
-sh /opt/nova/config-nova.sh api
-
-mysql -h ${MARIADBMASTER_PORT_3306_TCP_ADDR} -u root \
-	-p${DB_ROOT_PASSWORD} mysql <<EOF
-CREATE DATABASE IF NOT EXISTS ${NOVA_DB_NAME};
-GRANT ALL PRIVILEGES ON nova* TO
-	'${NOVA_DB_USER}'@'%' IDENTIFIED BY '${NOVA_DB_PASSWORD}'
-EOF
-
 export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
 export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONEMASTER_35357_PORT_35357_TCP_ADDR}:35357/v2.0"