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

diff --git a/nodemanager.spec b/nodemanager.spec
index 3b3a6c3..bc4a32d 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.*
 %{_datadir}/NodeManager/plugins/ipv6.*
 %{_datadir}/NodeManager/plugins/update_ipv6addr_slivertag.*
 

diff --git a/setup.py b/setup.py
index 8da2f67..94f92c5 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',
         'plugins.ipv6',
         'plugins.update_ipv6addr_slivertag', 
 # vs