From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 30 Oct 2014 08:58:39 +0000 (+0100)
Subject: Merge branch 'ipv6'
X-Git-Tag: nodemanager-5.2-15~3
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=ecee05390277f57b02d21ffca0195292bde1defa;hp=-c

Merge branch 'ipv6'

only one minor conflict found in a comment in Makefile
---

ecee05390277f57b02d21ffca0195292bde1defa
diff --combined Makefile
index 824138e,2a073d3..5221fa8
--- a/Makefile
+++ b/Makefile
@@@ -135,7 -135,7 +135,7 @@@ NODEURL:=root@$(NODE):
  endif
  
  # this is for lxc only, we need to exclude the vs stuff that otherwise messes up everything on node
- # xxx keep this in sync with setup.spec
 -# keep this in sync with setup.spec
++# WARNING: keep this in sync with setup.spec
  LXC_EXCLUDES= --exclude sliver_vs.py --exclude coresched_vs.py --exclude drl.py
  
  # run with make SYNC_RESTART=false if you want to skip restarting nm
@@@ -158,26 -158,6 +158,26 @@@ els
  	-$(SYNC_RESTART) && { ssh -i $(NODE).key.rsa root@$(NODE) service nm restart ; } ||:
  endif
  
 +# this is for vs only, we need to exclude the lxc stuff that otherwise messes up everything on node
 +# xxx keep this in sync with setup.spec
 +VS_EXCLUDES= --exclude sliver_libvirt.py --exclude sliver_lxc.py --exclude cgroups.py --exclude coresched_lxc.py --exclude privatebridge.py
 +
 +syncvs: $(NODE).key.rsa
 +ifeq (,$(NODEURL))
 +	@echo "syncvs: You must define NODE on the command line"
 +	@echo "  e.g. make sync NODE=vnode01.inria.fr"
 +	@exit 1
 +else
 +	@echo xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 +	@echo WARNING : this target might not be very reliable - use with care
 +	@echo xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 +	+$(RSYNC) $(VS_EXCLUDES) --delete-excluded ./ $(NODEURL)/usr/share/NodeManager/
 +	+$(RSYNC) ./initscripts/ $(NODEURL)/etc/init.d/
 +#	+$(RSYNC) ./systemd/ $(NODEURL)/usr/lib/systemd/system/
 +	-$(SYNC_RESTART) && { ssh -i $(NODE).key.rsa root@$(NODE) service nm restart ; } ||:
 +endif
 +
 +
  ### fetching the key
  
  TESTMASTER ?= testmaster.onelab.eu