X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=blobdiff_plain;f=Makefile;h=f7add422922fe11de7a4007830e58c7d2c82cf32;hp=7cb8a6563e76946d207899f677796ef251d1152f;hb=HEAD;hpb=094a91004df52c1db9cbdd65abe8bff6dbccd99c

diff --git a/Makefile b/Makefile
index 7cb8a65..f7add42 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,63 @@
-# 
-# $Id: Makefile 682 2007-07-19 09:00:25Z thierry $
 #
 
-########## make sync PLCHOST=hostname
-########## make sync PLCHOST=hostname
-ifdef PLCHOST
-ifdef VSERVER
-PLCSSH:=root@$(PLCHOST):/vservers/$(VSERVER)
+########## sync
+# 2 forms are supported
+# (*) if your plc root context has direct ssh access:
+# make sync PLC=private.one-lab.org
+# (*) otherwise, for test deployments, use on your testmaster
+# $ run export
+# and cut'n paste the export lines before you run make sync
+
+PLCHOSTLXC ?= lxc64-1.pl.sophia.inria.fr
+
+ifdef PLC
+SSHURL:=root@$(PLC):/
+SSHCOMMAND:=ssh root@$(PLC)
+else
+ifdef PLCHOSTLXC
+SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME)
+SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh -o StrictHostKeyChecking=no -o LogLevel=quiet $(GUESTHOSTNAME)
+else
+ifdef PLCHOSTVS
+SSHURL:=root@$(PLCHOSTVS):/vservers/$(GUESTNAME)
+SSHCOMMAND:=ssh root@$(PLCHOSTVS) vserver $(GUESTNAME) exec
+endif
 endif
 endif
 
-LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' --exclude debug_root_ssh_key
-RSYNC_EXCLUDES		:= --exclude .svn --exclude CVS --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
+LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' 
+RSYNC_EXCLUDES		:= --exclude .svn --exclude .git --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
 RSYNC_COND_DRY_RUN	:= $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
 RSYNC			:= rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
 
+DEPLOYMENT ?= regular
+
 sync:
-ifeq (,$(PLCSSH))
-	echo "sync: You must define PLCHOST and VSERVER on the command line"
-	echo " e.g. make sync PLCHOST=private.one-lab.org VSERVER=myplc01" ; exit 1
+ifeq (,$(SSHURL))
+	@echo "sync: I need more info from the command line, e.g."
+	@echo "  make sync PLC=boot.planetlab.eu"
+	@echo "  make sync PLCHOSTVS=.. GUESTNAME=.."
+	@echo "  make sync PLCHOSTLXC=.. GUESTNAME=.. GUESTHOSTNAME=.."
+	@exit 1
 else
-	+$(RSYNC) source $(PLCSSH)/usr/share/bootmanager/
-	ssh root@$(PLCHOST) vserver $(VSERVER) exec service plc start bootmanager
+	$(SSHCOMMAND) mkdir -p /usr/share/bootmanager/$(DEPLOYMENT)
+	+$(RSYNC) build.sh source $(SSHURL)/usr/share/bootmanager/$(DEPLOYMENT)
+	$(SSHCOMMAND) /etc/plc.d/bootmanager start
 endif
 
 ##########
 tags:
-	find . '(' -name '*.py' -o -name '*.spec' ')' | xargs etags
+	git ls-files | xargs etags
 
 .PHONY: tags
+
+##########
+# this one is for overwriting the code in /tmp/source on a node
+# that is in debug mode
+ifndef NODE
+debugmode:
+	echo run make debugmode NODE=a-real-ple-node
+else
+debugmode:
+	rsync -av -e 'ssh -i /Users/parmentelat/.ssh/ple_debug.rsa' ./source/ root@$(NODE):/tmp/source/
+endif