diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-14 12:39:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-14 12:39:40 +0000 |
| commit | cd13790136de3ada1973ba639eff1bcf1fb5e544 (patch) | |
| tree | f4b53f9724b996313bb843d55eb2633d65c95ee9 /docker | |
| parent | 659dbe6f636c5f4e0a1584d44716e24b788f9b37 (diff) | |
| parent | 282b9d2daa6d9129c46ec903d565d910512c2507 (diff) | |
| download | kolla-cd13790136de3ada1973ba639eff1bcf1fb5e544.tar.gz kolla-cd13790136de3ada1973ba639eff1bcf1fb5e544.zip | |
Merge "Nova-api should not set up the database"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova-controller/nova-api/start.sh | 9 |
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" |