move plugin to prevent conflict in __init__.py

diff --git a/setup-lib.py b/setup-lib.py
index 01872b3..810d45e 100644 (file)
--- a/setup-lib.py
+++ b/setup-lib.py
@@ -33,6 +33,7 @@ setup(
         'plugins.hostmap',
         'plugins.interfaces',
         'plugins.omf_resctl',
+        'plugins.privatebridge',
         'plugins.rawdisk',
         'plugins.reservation',
         'plugins.sfagids',

diff --git a/setup-lxc.py b/setup-lxc.py
index e52de84..14954d2 100644 (file)
--- a/setup-lxc.py
+++ b/setup-lxc.py
@@ -14,7 +14,7 @@ setup(
         'sliver_lxc',
         'cgroups',
         'coresched_lxc',
-        'plugins.privatebridge',
+#        'plugins.privatebridge',
         ],
     scripts = [
         ],