Merge "os_vif: register objects before loading plugins"
This commit is contained in:
commit
5bd5bdfdd0
|
@ -34,6 +34,9 @@ def initialize(reset=False):
|
||||||
|
|
||||||
"""
|
"""
|
||||||
global _EXT_MANAGER
|
global _EXT_MANAGER
|
||||||
|
if _EXT_MANAGER is None:
|
||||||
|
os_vif.objects.register_all()
|
||||||
|
|
||||||
if reset or (_EXT_MANAGER is None):
|
if reset or (_EXT_MANAGER is None):
|
||||||
_EXT_MANAGER = extension.ExtensionManager(namespace='os_vif',
|
_EXT_MANAGER = extension.ExtensionManager(namespace='os_vif',
|
||||||
invoke_on_load=False)
|
invoke_on_load=False)
|
||||||
|
@ -42,8 +45,6 @@ def initialize(reset=False):
|
||||||
obj = cls.load(plugin_name)
|
obj = cls.load(plugin_name)
|
||||||
_EXT_MANAGER[plugin_name].obj = obj
|
_EXT_MANAGER[plugin_name].obj = obj
|
||||||
|
|
||||||
os_vif.objects.register_all()
|
|
||||||
|
|
||||||
|
|
||||||
def plug(vif, instance_info):
|
def plug(vif, instance_info):
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in New Issue