openstack/kolla-ansible
Code Issues Proposed changes

Merge "Nova-api should not set up the database"

Browse Source
This commit is contained in:
Jenkins 2014-10-14 12:39:40 +00:00 committed by Gerrit Code Review
commit cd13790136
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/nova-controller/nova-api/start.sh
View File

@ -22,15 +22,6 @@ if ! [ "$NOVA_DB_PASSWORD" ]; then
export NOVA_DB_PASSWORD export NOVA_DB_PASSWORD
fi 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_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONEMASTER_35357_PORT_35357_TCP_ADDR}:35357/v2.0" export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONEMASTER_35357_PORT_35357_TCP_ADDR}:35357/v2.0"