Merge "Remove the unused plugins framework"

1 files changed, 0 insertions, 10 deletions

diff --git a/nova/manager.py b/nova/manager.py
index d1cd26a4d..8fb5db81f 100644
--- a/nova/manager.py
+++ b/nova/manager.py
@@ -60,7 +60,6 @@ from nova.db import base
 from nova.objects import base as objects_base
 from nova.openstack.common import log as logging
 from nova.openstack.common import periodic_task
-from nova.openstack.common.plugin import pluginmanager
 from nova.openstack.common.rpc import dispatcher as rpc_dispatcher
 from nova.scheduler import rpcapi as scheduler_rpcapi
 
@@ -78,15 +77,10 @@ class Manager(base.Base, periodic_task.PeriodicTasks):
         if not host:
             host = CONF.host
         self.host = host
-        self.load_plugins()
         self.backdoor_port = None
         self.service_name = service_name
         super(Manager, self).__init__(db_driver)
 
-    def load_plugins(self):
-        pluginmgr = pluginmanager.PluginManager('nova', self.__class__)
-        pluginmgr.load_plugins()
-
     def create_rpc_dispatcher(self, backdoor_port=None, additional_apis=None):
         '''Get the rpc dispatcher for this manager.
 
@@ -151,10 +145,6 @@ class SchedulerDependentManager(Manager):
         super(SchedulerDependentManager, self).__init__(host, db_driver,
                 service_name)
 
-    def load_plugins(self):
-        pluginmgr = pluginmanager.PluginManager('nova', self.service_name)
-        pluginmgr.load_plugins()
-
     def update_service_capabilities(self, capabilities):
         """Remember these capabilities to send on next periodic update."""
         if not isinstance(capabilities, list):