X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=08142ee20e398a0607abead9425de6beaafae859;hb=4e488ba339356a898cf7d42f22e4224f7ec07428;hp=e17e26343411cb76d8655e21136c80811f158e9e;hpb=c40748ce15f446462fe7050aaf825cc6e81c6d82;p=nodemanager.git

diff --git a/Makefile b/Makefile
index e17e263..08142ee 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,9 @@ lib: forward_api_calls
 vs: 
 	python setup-vs.py build
 
+lxc: 
+	python setup-lxc.py build
+
 forward_api_calls: forward_api_calls.c
 	$(CC) -Wall -Os -o $@ $?
 	strip $@
@@ -34,9 +37,17 @@ install-vs:
 	    --install-scripts=$(DESTDIR)/$(bindir)
 	install -m 444 README $(DESTDIR)/$(datadir)/NodeManager
 
+install-lxc:
+	python setup-lxc.py install \
+	    --install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
+	    --install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
+	    --install-scripts=$(DESTDIR)/$(bindir)
+	install -m 444 README $(DESTDIR)/$(datadir)/NodeManager
+
 clean:
 	python setup-lib.py clean
 	python setup-vs.py clean
+	python setup-lxc.py clean
 	rm -f forward_api_calls *.pyc build
 
 .PHONY: all install clean
@@ -49,8 +60,17 @@ tags:
 
 ########## sync
 # for use with the test framework; push local stuff on a test node
-# make sync NODE=vnode01.inria.fr
-# specify TESTMASTER and BUILD if the key is not available yet
+# howto use: go on testmaster in the build you want to use and just run
+# $ exp
+# cut'n paste the result in a terminal in your working dir, e.g. (although all are not required)
+# $ export BUILD=2013.07.02--lxc18
+# $ export PLCHOSTLXC=gotan.pl.sophia.inria.fr
+# $ export GUESTNAME=2013.07.02--lxc18-1-vplc01
+# $ export GUESTHOSTNAME=vplc01.pl.sophia.inria.fr
+# $ export KVMHOST=kvm64-6.pl.sophia.inria.fr
+# $ export NODE=vnode01.pl.sophia.inria.fr
+# and then just run
+# $ make sync
 
 LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' 
 RSYNC_EXCLUDES		:= --exclude .git  --exclude .svn --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
@@ -67,7 +87,8 @@ ifeq (,$(NODEURL))
 	@echo "  e.g. make sync NODE=vnode01.inria.fr"
 	@exit 1
 else
-	+$(RSYNC) ./ $(NODEURL)/usr/share/NodeManager/
+	+$(RSYNC) --exclude sshsh ./ $(NODEURL)/usr/share/NodeManager/
+	+$(RSYNC) ./sshsh $(NODEURL)/bin/
 	+$(RSYNC) ./initscripts/nm $(NODEURL)/etc/init.d/nm
 	ssh -i $(NODE).key.rsa root@$(NODE) service nm restart
 endif
@@ -92,16 +113,3 @@ else
 	@echo "FETCHING key"
 	+scp $(KEYURL) $@
 endif
-
-### utility - find out the node name for a given BUILD
-
-ifdef BUILD
-NODEIPCOMMAND:=ssh root@$(TESTMASTER) cat $(BUILD)/arg-ips-node
-endif
-
-nodename:
-ifeq (,$(NODEIPCOMMAND))
-	@echo "nodename: You must define TESTMASTER and BUILD on the command line"
-else
-	$(NODEIPCOMMAND)
-endif