From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 15 May 2014 11:39:29 +0000 (+0200)
Subject: Merge branch 'packaging'
X-Git-Tag: nodemanager-5.2-14~23
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=63546278c1e00ac6d1910d4d552a933bd170ed28

Merge branch 'packaging'
---

63546278c1e00ac6d1910d4d552a933bd170ed28
diff --cc nodemanager.spec
index bbb8afb,ac6a08c..22c79b1
--- a/nodemanager.spec
+++ b/nodemanager.spec
@@@ -139,11 -181,70 +181,74 @@@ rm -rf $RPM_BUILD_ROO
  /var/lib/nodemanager/
  %config(noreplace) /etc/sysconfig/nodemanager
  
+ ##############################
+ %if "%{build_lxc}" == "1"
+ 
+ %package -n nodemanager-lxc
+ Summary: PlanetLab Node Manager Plugin for lxc nodes
+ Group: System Environment/Daemons
+ # we use libvirt
+ Requires: libvirt
+ Requires: libvirt-python
+ # cgroups.py needs this
+ Requires: python-inotify
+ # the common package for nodemanager
+ Requires: nodemanager-lib = %{version}
+ # the lxc-specific tools for using slice images
+ Requires: lxc-sliceimage
+ Requires: openvswitch
+ 
+ %description -n nodemanager-lxc
+ nodemanager-lxc provides the lxc code for the PlanetLab Node Manager.
+ 
+ %files -n nodemanager-lxc
+ %{_datadir}/NodeManager/sliver_libvirt.*
+ %{_datadir}/NodeManager/sliver_lxc.*
+ %{_datadir}/NodeManager/cgroups.*
+ %{_datadir}/NodeManager/coresched_lxc.*
+ 
+ %endif
+ ##############################
+ 
+ ##############################
+ %if "%{build_vs}" == "1"
+ 
+ %package -n nodemanager-vs
+ Summary: PlanetLab Node Manager Plugin for vserver nodes
+ Group: System Environment/Daemons
+ 
+ # old name, when all came as a single package with vserver wired in
+ Obsoletes: NodeManager
+ # for nodeupdate 
+ Provides: nodemanager
+ 
+ # our interface to the vserver patch
+ Requires: util-vserver >= 0.30.208-17
+ # and the planetlab utilities
+ Requires: util-vserver-python > 0.3-16
+ # the common package for nodemanager
+ Requires: nodemanager-lib = %{version}
+ # the vserver-specific tools for using slice images
+ Requires: vserver-sliceimage
+ 
+ %description -n nodemanager-vs
+ nodemanager-vs provides the vserver code for the PlanetLab Node Manager.
+ 
+ %files -n nodemanager-vs
+ %{_datadir}/NodeManager/sliver_vs.*
+ %{_datadir}/NodeManager/coresched_vs.*
+ # this plugin uses vserver for now
+ %{_datadir}/NodeManager/plugins.drl.*
+ 
+ %endif
+ ##############################
+ 
+ ##############################
  %changelog
 +* Mon Apr 28 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-5.2-13
 +- improve network management in slices
 +- _has_systemctl was not declared as global - vsys was failing to restart
 +
  * Fri Apr 04 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-5.2-12
  - this tag for the first time passes the full range of tests on fedora20
  - robustified slice teardown wrt vsys