move the 2 ipv6-related plugins over to the common packaging

diff --git a/nodemanager.spec b/nodemanager.spec
index bc4a32d..f43c98a 100644 (file)
--- a/nodemanager.spec
+++ b/nodemanager.spec
@@ -175,6 +175,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/NodeManager/plugins/syndicate.*
 %{_datadir}/NodeManager/plugins/vsys.*
 %{_datadir}/NodeManager/plugins/vsys_privs.*
+%{_datadir}/NodeManager/plugins/ipv6.*
+%{_datadir}/NodeManager/plugins/update_ipv6addr_slivertag.*
 %{_datadir}/NodeManager/sliver-initscripts/
 %{_datadir}/NodeManager/sliver-systemd/
 %{_bindir}/forward_api_calls
@@ -209,8 +211,6 @@ nodemanager-lxc provides the lxc code for the PlanetLab Node Manager.
 %{_datadir}/NodeManager/cgroups.*
 %{_datadir}/NodeManager/coresched_lxc.*
 %{_datadir}/NodeManager/plugins/privatebridge.*
-%{_datadir}/NodeManager/plugins/ipv6.*
-%{_datadir}/NodeManager/plugins/update_ipv6addr_slivertag.*
 
 %endif
 ##############################

diff --git a/setup.py b/setup.py
index 94f92c5..097c5f2 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -41,14 +41,14 @@ setup(
         'plugins.syndicate',
         'plugins.vsys',
         'plugins.vsys_privs',
+        'plugins.ipv6',
+        'plugins.update_ipv6addr_slivertag', 
 # lxc
         'sliver_libvirt',
         'sliver_lxc',
         'cgroups',
         'coresched_lxc',
         'plugins.privatebridge',
-        'plugins.ipv6',
-        'plugins.update_ipv6addr_slivertag', 
 # vs
         'sliver_vs',
         'coresched_vs',