Use oslo.db create_engine instead of SQLAlchemy

oslo.db may set additional options to engines that we may be interested in.

blueprint enable-mysql-connector

Closes-Bug: #1350942
Change-Id: I6f67bb430c50ddacb2d53398de75fb5f494964a0

diff --git a/neutron/db/migration/alembic_migrations/env.py b/neutron/db/migration/alembic_migrations/env.py
index db20ce912f48a378f8e7c807e2a7ba4110488921..98c2678ea16cba50a07a1220e454c7e140bc20a6 100644 (file)
--- 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 504061ed7cc4c732b6c930974d5793a004987656..e42c9206c9656f79ecbca58670bbe8ebfdfb99db 100755 (executable)
--- 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)