Cisco Neutron plugin fails DB migration

Alembic migration from revision f44ab9871cd6 to 2eeaf963a447 fails
because the floatingips table doesn't exist.

The fix is to add the plugin to the DB migration path for l3 and ext_gw_mode.

Change-Id: Ic7a9c1d624d2838e9313fa95ed6ddbfea9b6e1c9
Closes-Bug: #1289039

diff --git a/neutron/db/migration/alembic_migrations/versions/128e042a2b68_ext_gw_mode.py b/neutron/db/migration/alembic_migrations/versions/128e042a2b68_ext_gw_mode.py
index b2aa6443d4a5e511c026c5164766975e02c7388c..dc4c14c14ae6860cb980dfec637442aa00dfe1cb 100644 (file)
--- a/neutron/db/migration/alembic_migrations/versions/128e042a2b68_ext_gw_mode.py
+++ b/neutron/db/migration/alembic_migrations/versions/128e042a2b68_ext_gw_mode.py
@@ -44,6 +44,7 @@ migration_for_plugins = [
     'neutron.plugins.embrane.plugins.embrane_ovs_plugin.EmbraneOvsPlugin',
     'neutron.plugins.ibm.sdnve_neutron_plugin.SdnvePluginV2',
     'neutron.plugins.oneconvergence.plugin.OneConvergencePluginV2',
+    'neutron.plugins.cisco.network_plugin.PluginV2',
 ]
 
 from alembic import op

diff --git a/neutron/db/migration/alembic_migrations/versions/2c4af419145b_l3_support.py b/neutron/db/migration/alembic_migrations/versions/2c4af419145b_l3_support.py
index 40b53d49913fc51103c91c6627b95410cd7d5982..61ba088d300cda9285d80d466c413ba7e470b034 100644 (file)
--- a/neutron/db/migration/alembic_migrations/versions/2c4af419145b_l3_support.py
+++ b/neutron/db/migration/alembic_migrations/versions/2c4af419145b_l3_support.py
@@ -37,7 +37,8 @@ migration_for_plugins = [
     'neutron.plugins.nicira.NeutronServicePlugin.NvpAdvancedPlugin',
     'neutron.plugins.vmware.plugin.NsxPlugin',
     'neutron.plugins.vmware.plugin.NsxServicePlugin',
-    'neutron.plugins.embrane.plugins.embrane_ovs_plugin.EmbraneOvsPlugin'
+    'neutron.plugins.embrane.plugins.embrane_ovs_plugin.EmbraneOvsPlugin',
+    'neutron.plugins.cisco.network_plugin.PluginV2',
 ]
 
 from neutron.db import migration