clear db._ENGINE for each plugin init in Metaplugin

Fixes bug 1036996

Change-Id: I7f289b4ccda281a66666ec1dbf7fc01156b0512c

diff --git a/quantum/plugins/metaplugin/meta_quantum_plugin.py b/quantum/plugins/metaplugin/meta_quantum_plugin.py
index 7b2300bd6ae9349f258f736c4fbaf4c3797dbcad..669f22b6fff32a2e6ffbb1d8a13746dad8814e5a 100644 (file)
--- a/quantum/plugins/metaplugin/meta_quantum_plugin.py
+++ b/quantum/plugins/metaplugin/meta_quantum_plugin.py
@@ -66,7 +66,10 @@ class MetaPluginV2(db_base_plugin_v2.QuantumDbPluginV2):
                        in cfg.CONF.META.plugin_list.split(',')]
         for flavor, plugin_provider in plugin_list:
             self.plugins[flavor] = self._load_plugin(plugin_provider)
+            # Needed to clear _ENGINE for each plugin
+            db._ENGINE = None
 
+        db.configure_db(options)
         self.extension_map = {}
         if not cfg.CONF.META.extension_map == '':
             extension_list = [method_set.split(':')