openstack/aodh
Code Issues Proposed changes

Merge "sqlalchemy: remove Ceilometer upgrade workaround"

Browse Source
This commit is contained in:
Jenkins 2016-10-11 08:34:55 +00:00 committed by Gerrit Code Review
commit e8eafdbba7
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
aodh/storage/impl_sqlalchemy.py
View File

@ -20,7 +20,6 @@ import os.path
from alembic import command from alembic import command
from alembic import config from alembic import config
from alembic import migration from alembic import migration
from oslo_db import exception
from oslo_db.sqlalchemy import session as db_session from oslo_db.sqlalchemy import session as db_session
from oslo_db.sqlalchemy import utils as oslo_sql_utils from oslo_db.sqlalchemy import utils as oslo_sql_utils
from oslo_log import log from oslo_log import log
@ -95,14 +94,7 @@ class Connection(base.Connection):
ctxt = migration.MigrationContext.configure(engine.connect()) ctxt = migration.MigrationContext.configure(engine.connect())
current_version = ctxt.get_current_revision() current_version = ctxt.get_current_revision()
if current_version is None: if current_version is None:
try:
models.Base.metadata.create_all(engine, checkfirst=False) models.Base.metadata.create_all(engine, checkfirst=False)
except exception.DBError:
# Assume tables exist from Ceilometer, take control
# FIXME(jd) Remove in Ocata
command.stamp(cfg, "12fe8fac9fe4")
command.upgrade(cfg, "head")
else:
command.stamp(cfg, "head") command.stamp(cfg, "head")
else: else:
command.upgrade(cfg, "head") command.upgrade(cfg, "head")