commit 83c6d98ca2b9b268a0f4acd5df0fd9e5ec1a9c30 Author: Pradeep Kilambi Date: Thu Mar 13 14:25:16 2014 -0400 Include cisco plugin in migration plugins with ovs Currently we have many migration files with missing cisco plugin in migrate_plugin when ovs is included.This causes missing tables when cisco plugin is enabled and migration is run. This fix should automatically include the cisco plugin if ovs is detected in the migrate_plugins. Closes-Bug: #1292114 diff --git a/neutron/db/migration/__init__.py b/neutron/db/migration/__init__.py index 93a0e02..04a2b4e 100644 --- a/neutron/db/migration/__init__.py +++ b/neutron/db/migration/__init__.py @@ -14,9 +14,14 @@ # # @author: Mark McClain, DreamHost +OVS_PLUGIN ='neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2' +CISCO_PLUGIN = 'neutron.plugins.cisco.network_plugin.PluginV2' def should_run(active_plugins, migrate_plugins): if '*' in migrate_plugins: return True else: + if (CISCO_PLUGIN not in migrate_plugins and + OVS_PLUGIN in migrate_plugins): + migrate_plugins.append(CISCO_PLUGIN) return set(active_plugins) & set(migrate_plugins)