diff --git a/neutron/db/migration/alembic_migrations/env.py b/neutron/db/migration/alembic_migrations/env.py index db20ce912..98c2678ea 100644 --- a/neutron/db/migration/alembic_migrations/env.py +++ b/neutron/db/migration/alembic_migrations/env.py @@ -18,8 +18,9 @@ from logging import config as logging_config from alembic import context from oslo.config import cfg +from oslo.db.sqlalchemy import session import sqlalchemy as sa -from sqlalchemy import create_engine, event, pool +from sqlalchemy import event from neutron.db import model_base from neutron.openstack.common import importutils @@ -96,10 +97,7 @@ def run_migrations_online(): """ set_mysql_engine() - - engine = create_engine( - neutron_config.database.connection, - poolclass=pool.NullPool) + engine = session.create_engine(neutron_config.database.connection) connection = engine.connect() context.configure( diff --git a/neutron/db/migration/migrate_to_ml2.py b/neutron/db/migration/migrate_to_ml2.py index 504061ed7..e42c9206c 100755 --- a/neutron/db/migration/migrate_to_ml2.py +++ b/neutron/db/migration/migrate_to_ml2.py @@ -60,6 +60,7 @@ To manually test migration from ovs to ml2 with devstack: import argparse +from oslo.db.sqlalchemy import session import sqlalchemy as sa from neutron.extensions import portbindings @@ -126,7 +127,7 @@ class BaseMigrateToMl2_Icehouse(object): def __call__(self, connection_url, save_tables=False, tunnel_type=None, vxlan_udp_port=None): - engine = sa.create_engine(connection_url) + engine = session.create_engine(connection_url) metadata = sa.MetaData() check_db_schema_version(engine, metadata)