use plugin_dir in conf to substitute default plugin dir

Signed-off-by: Gui Chen <gui.chen@intel.com>

diff --git a/mic/plugin.py b/mic/plugin.py
index 4654135..41c5665 100644 (file)
--- a/mic/plugin.py
+++ b/mic/plugin.py
@@ -18,12 +18,11 @@
 import os, sys
 import msger
 import pluginbase
+from mic.conf import configmgr
 from mic.utils import errors
 
 __ALL__ = ['PluginMgr', 'pluginmgr']
 
-DEFAULT_PLUGIN_LOCATION = "/usr/lib/mic/plugins"
-
 PLUGIN_TYPES = ["imager", "backend"] # TODO  "hook"
 
 class PluginMgr(object):
@@ -38,7 +37,7 @@ class PluginMgr(object):
         return cls._instance
 
     def __init__(self):
-        pass
+        self.plugin_dir = configmgr.common['plugin_dir']
 
     def append_dirs(self, dirs):
         for path in dirs:
@@ -87,7 +86,7 @@ class PluginMgr(object):
         if ptype not in PLUGIN_TYPES:
             raise errors.CreatorError('%s is not valid plugin type' % ptype)
 
-        self._add_plugindir(os.path.join(DEFAULT_PLUGIN_LOCATION, ptype))
+        self._add_plugindir(os.path.join(self.plugin_dir, ptype))
         self._load_all()
 
         return pluginbase.get_plugins(ptype)