From: Scott Baker <smbaker@gmail.com>
Date: Wed, 13 Nov 2013 02:12:41 +0000 (-0800)
Subject: move plugin to prevent conflict in __init__.py
X-Git-Tag: nodemanager-5.2-9~1
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=31c35b9a18813d194c7d84a6f6f3406fd926899d

move plugin to prevent conflict in __init__.py
---

diff --git a/setup-lib.py b/setup-lib.py
index 01872b3..810d45e 100644
--- 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
--- a/setup-lxc.py
+++ b/setup-lxc.py
@@ -14,7 +14,7 @@ setup(
         'sliver_lxc',
         'cgroups',
         'coresched_lxc',
-        'plugins.privatebridge',
+#        'plugins.privatebridge',
         ],
     scripts = [
         ],