From ae8ce78e5517423a9a971472bec061079f1cabe7 Mon Sep 17 00:00:00 2001 From: Doug Szumski Date: Wed, 19 Sep 2018 16:34:04 +0000 Subject: [PATCH] Use alembic migrations to deploy Monasca DB Support has recently been added for managing the Monasca DB with alembic. This change takes advantage of that. Partially-Implements: blueprint monasca-containers Change-Id: I89084ac0076eff099e567b32de249df9f0115e82 --- docker/monasca/monasca-api/extend_start.sh | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/docker/monasca/monasca-api/extend_start.sh b/docker/monasca/monasca-api/extend_start.sh index 6152e416a5..5ea66ca4c0 100644 --- a/docker/monasca/monasca-api/extend_start.sh +++ b/docker/monasca/monasca-api/extend_start.sh @@ -5,15 +5,7 @@ SERVICE="monasca-api" # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - # Set the database name in the monasca database schema - sed "s/USE \`mon\`;/USE \`${MONASCA_DATABASE_NAME}\`;/g" \ - /monasca-api/devstack/files/schema/mon_mysql.sql > /tmp/mon_mysql.sql - # Load the schema - mysql --host=${MONASCA_DATABASE_ADDRESS} \ - --port=${MONASCA_DATABASE_PORT} \ - --user=${MONASCA_DATABASE_USER} \ - --password=${MONASCA_DATABASE_PASSWORD} \ - < /tmp/mon_mysql.sql + monasca_db upgrade exit 0 fi