Merge "Config will be done by the controller"

This commit is contained in:
Jenkins 2014-10-14 19:20:05 +00:00 committed by Gerrit Code Review
commit 578aab571f

View File

@ -22,8 +22,6 @@ if ! [ "$NOVA_DB_PASSWORD" ]; then
export NOVA_DB_PASSWORD export NOVA_DB_PASSWORD
fi fi
sh /opt/nova/config-nova.sh conductor
mysql -h ${MARIADBMASTER_PORT_3306_TCP_ADDR} -u root \ mysql -h ${MARIADBMASTER_PORT_3306_TCP_ADDR} -u root \
-p${DB_ROOT_PASSWORD} mysql <<EOF -p${DB_ROOT_PASSWORD} mysql <<EOF
CREATE DATABASE IF NOT EXISTS ${NOVA_DB_NAME}; CREATE DATABASE IF NOT EXISTS ${NOVA_DB_NAME};