From: Salvatore Orlando <salv.orlando@gmail.com>
Date: Mon, 25 Aug 2014 11:52:49 +0000 (-0700)
Subject: Do not explicitly set mysql_engine
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=25f117bacf1cb110260d96e764ae8fac9440c14e;p=openstack-build%2Fneutron-build.git

Do not explicitly set mysql_engine

Setting the mysql_engine when creating a table is not needed
anymore as this is automatically done by an event listener
added with commit 466e89970f11918a809aafe8a048d138d4664299

Change-Id: I0df978dbf2bb44f17102da3c17fd4e93c9e4df8d
Closes-Bug: #1361176
---

diff --git a/neutron/db/migration/alembic_migrations/versions/19180cf98af6_nsx_gw_devices.py b/neutron/db/migration/alembic_migrations/versions/19180cf98af6_nsx_gw_devices.py
index fafb85a51..c5972444e 100644
--- a/neutron/db/migration/alembic_migrations/versions/19180cf98af6_nsx_gw_devices.py
+++ b/neutron/db/migration/alembic_migrations/versions/19180cf98af6_nsx_gw_devices.py
@@ -51,8 +51,7 @@ def upgrade(active_plugins=None, options=None):
         sa.Column('interface_name', sa.String(length=64), nullable=True),
         sa.ForeignKeyConstraint(['network_gateway_id'], ['networkgateways.id'],
                                 ondelete='CASCADE'),
-        sa.PrimaryKeyConstraint('id', 'network_gateway_id', 'interface_name'),
-        mysql_engine='InnoDB')
+        sa.PrimaryKeyConstraint('id', 'network_gateway_id', 'interface_name'))
     # Copy data from networkgatewaydevices into networkgatewaydevicereference
     op.execute("INSERT INTO networkgatewaydevicereferences SELECT "
                "id, network_gateway_id, interface_name FROM "
@@ -68,8 +67,7 @@ def upgrade(active_plugins=None, options=None):
         sa.Column('connector_type', sa.String(length=10), nullable=True),
         sa.Column('connector_ip', sa.String(length=64), nullable=True),
         sa.Column('status', sa.String(length=16), nullable=True),
-        sa.PrimaryKeyConstraint('id'),
-        mysql_engine='InnoDB')
+        sa.PrimaryKeyConstraint('id'))
     # Create a networkgatewaydevice for each existing reference.
     # For existing references nsx_id == neutron_id
     # Do not fill conenctor info as they would be unknown
@@ -93,8 +91,7 @@ def downgrade(active_plugins=None, options=None):
         sa.Column('interface_name', sa.String(length=64), nullable=True),
         sa.ForeignKeyConstraint(['network_gateway_id'], ['networkgateways.id'],
                                 ondelete='CASCADE'),
-        sa.PrimaryKeyConstraint('id'),
-        mysql_engine='InnoDB')
+        sa.PrimaryKeyConstraint('id'))
     # Copy from networkgatewaydevicereferences to networkgatewaydevices
     op.execute("INSERT INTO networkgatewaydevices SELECT "
                "id, network_gateway_id, interface_name FROM "
diff --git a/neutron/db/migration/alembic_migrations/versions/3c6e57a23db4_add_multiprovider.py b/neutron/db/migration/alembic_migrations/versions/3c6e57a23db4_add_multiprovider.py
index 1b134fae7..880f6460c 100644
--- a/neutron/db/migration/alembic_migrations/versions/3c6e57a23db4_add_multiprovider.py
+++ b/neutron/db/migration/alembic_migrations/versions/3c6e57a23db4_add_multiprovider.py
@@ -64,9 +64,7 @@ def upgrade(active_plugins=None, options=None):
         sa.Column('network_id', sa.String(length=36), nullable=False),
         sa.ForeignKeyConstraint(['network_id'], ['networks.id'],
                                 ondelete='CASCADE'),
-        sa.PrimaryKeyConstraint('network_id'),
-        mysql_engine='InnoDB'
-    )
+        sa.PrimaryKeyConstraint('network_id'))
     op.create_table('rename_nvp_network_bindings',
                     sa.Column('network_id', sa.String(length=36),
                               primary_key=True),
diff --git a/neutron/db/migration/alembic_migrations/versions/4a666eb208c2_service_router.py b/neutron/db/migration/alembic_migrations/versions/4a666eb208c2_service_router.py
index ad3356b45..8123ac1e4 100644
--- a/neutron/db/migration/alembic_migrations/versions/4a666eb208c2_service_router.py
+++ b/neutron/db/migration/alembic_migrations/versions/4a666eb208c2_service_router.py
@@ -53,9 +53,7 @@ def upgrade(active_plugins=None, options=None):
         sa.Column('router_id', sa.String(length=36), nullable=False),
         sa.Column('edge_id', sa.String(length=16), nullable=True),
         sa.Column('lswitch_id', sa.String(length=36), nullable=False),
-        sa.PrimaryKeyConstraint('router_id'),
-        mysql_engine='InnoDB'
-    )
+        sa.PrimaryKeyConstraint('router_id'))
     op.add_column(
         u'nsxrouterextattributess',
         sa.Column('service_router', sa.Boolean(), nullable=False))