diff options
| author | Zuul <zuul@review.openstack.org> | 2018-09-20 08:32:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-09-20 08:32:18 +0000 |
| commit | 4c72aedb7620205d97c98d94868f1ce4da252be5 (patch) | |
| tree | 5111692e031e8b0ab886ca3e81474d810406374a /docker | |
| parent | 09b1147665c73ebd6b3c27befb19652c75428ec2 (diff) | |
| parent | ae8ce78e5517423a9a971472bec061079f1cabe7 (diff) | |
| download | kolla-4c72aedb7620205d97c98d94868f1ce4da252be5.tar.gz kolla-4c72aedb7620205d97c98d94868f1ce4da252be5.zip | |
Merge "Use alembic migrations to deploy Monasca DB"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/monasca/monasca-api/extend_start.sh | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/docker/monasca/monasca-api/extend_start.sh b/docker/monasca/monasca-api/extend_start.sh index 6152e416a..5ea66ca4c 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 |