Rename a variable name _ENGINE to _DB_ENGINE in metaplugin.
fixes bug 1206717 Change-Id: I9050021a9198b06d6796098282effd34ecd61710
This commit is contained in:
parent
0a21ea951b
commit
19cc71d633
@ -73,8 +73,8 @@ class MetaPluginV2(db_base_plugin_v2.NeutronDbPluginV2,
|
|||||||
in cfg.CONF.META.plugin_list.split(',')]
|
in cfg.CONF.META.plugin_list.split(',')]
|
||||||
for flavor, plugin_provider in plugin_list:
|
for flavor, plugin_provider in plugin_list:
|
||||||
self.plugins[flavor] = self._load_plugin(plugin_provider)
|
self.plugins[flavor] = self._load_plugin(plugin_provider)
|
||||||
# Needed to clear _ENGINE for each plugin
|
# Needed to clear _DB_ENGINE for each plugin
|
||||||
db._ENGINE = None
|
db._DB_ENGINE = None
|
||||||
|
|
||||||
self.l3_plugins = {}
|
self.l3_plugins = {}
|
||||||
l3_plugin_list = [plugin_set.split(':')
|
l3_plugin_list = [plugin_set.split(':')
|
||||||
@ -86,7 +86,7 @@ class MetaPluginV2(db_base_plugin_v2.NeutronDbPluginV2,
|
|||||||
else:
|
else:
|
||||||
# For l3 only plugin
|
# For l3 only plugin
|
||||||
self.l3_plugins[flavor] = self._load_plugin(plugin_provider)
|
self.l3_plugins[flavor] = self._load_plugin(plugin_provider)
|
||||||
db._ENGINE = None
|
db._DB_ENGINE = None
|
||||||
|
|
||||||
self.default_flavor = cfg.CONF.META.default_flavor
|
self.default_flavor = cfg.CONF.META.default_flavor
|
||||||
if self.default_flavor not in self.plugins:
|
if self.default_flavor not in self.plugins:
|
||||||
|
Loading…
Reference in New Issue
Block a user