an attempt to put the privatebridge plugin back into the -lxc rpm

diff --git a/nodemanager.spec b/nodemanager.spec
index ba4db62..19b2621 100644 (file)
--- a/nodemanager.spec
+++ b/nodemanager.spec
@@ -167,7 +167,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/NodeManager/plugins/hostmap.*
 %{_datadir}/NodeManager/plugins/interfaces.*
 %{_datadir}/NodeManager/plugins/omf_resctl.*
-%{_datadir}/NodeManager/plugins/privatebridge.*
 %{_datadir}/NodeManager/plugins/rawdisk.*
 %{_datadir}/NodeManager/plugins/reservation.*
 %{_datadir}/NodeManager/plugins/sfagids.*
@@ -209,6 +208,7 @@ nodemanager-lxc provides the lxc code for the PlanetLab Node Manager.
 %{_datadir}/NodeManager/sliver_lxc.*
 %{_datadir}/NodeManager/cgroups.*
 %{_datadir}/NodeManager/coresched_lxc.*
+%{_datadir}/NodeManager/plugins/privatebridge.*
 
 %endif
 ##############################

diff --git a/setup.py b/setup.py
index 55af519..db3f6b4 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,6 @@ setup(
         'plugins.hostmap',
         'plugins.interfaces',
         'plugins.omf_resctl',
-        'plugins.privatebridge',
         'plugins.rawdisk',
         'plugins.reservation',
         'plugins.sfagids',
@@ -47,6 +46,7 @@ setup(
         'sliver_lxc',
         'cgroups',
         'coresched_lxc',
+        'plugins.privatebridge',
 # vs
         'sliver_vs',
         'coresched_vs',