aboutsummaryrefslogtreecommitdiff
path: root/docker/nova-controller/nova-api
diff options
context:
space:
mode:
authorRyan Hallisey <rhallise@redhat.com>2014-10-13 23:18:55 +0000
committerRyan Hallisey <rhallise@redhat.com>2014-10-13 23:33:04 +0000
commit282b9d2daa6d9129c46ec903d565d910512c2507 (patch)
tree2c3bd19abaee841b631ec4e39dcd1b35d6fa28c4 /docker/nova-controller/nova-api
parent5192dd95062bbf2b86fb7ea05217edfa02f6f92a (diff)
downloadkolla-282b9d2daa6d9129c46ec903d565d910512c2507.tar.gz
kolla-282b9d2daa6d9129c46ec903d565d910512c2507.zip
Nova-api should not set up the database
Instead, nova-conductor will setup the database. Change-Id: I91a46aa9bc3fc99fe58053b239929c8121864283
Diffstat (limited to 'docker/nova-controller/nova-api')
-rw-r--r--docker/nova-controller/nova-api/start.sh9
1 files changed, 0 insertions, 9 deletions
diff --git a/docker/nova-controller/nova-api/start.sh b/docker/nova-controller/nova-api/start.sh
index ed2c11109..a8f077bc1 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"