X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=e6c256921514652e7de807a5bdb2bc8ff8118327;hb=4df085af669143c6605392fe92b081da265aca74;hp=b137434ce21442200165d0e3c4817b46f5b600c8;hpb=f699ab76a8c8a5ba09d2286a833a8a05ecf8564c;p=nodemanager.git

diff --git a/Makefile b/Makefile
index b137434..e6c2569 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,22 @@
 # autoconf compatible variables
 datadir := /usr/share
 bindir := /usr/bin
+initdir=/etc/init.d
+systemddir := /usr/lib/systemd/system
 
+####################
+# call with either WITH_SYSTEMD=true or WITH_INIT=true
+ifneq "$(WITH_SYSTEMD)" ""
+use_sytemd=true
+else
+ifneq "$(WITH_INIT)" ""
+use_systemd=""
+else # if not set then try to guess
+use_systemd=$(bash -c 'type -p systemctl')
+endif
+endif
+
+####################
 lib: forward_api_calls
 	python setup-lib.py build
 
@@ -23,27 +38,53 @@ forward_api_calls: forward_api_calls.c
 	$(CC) -Wall -Os -o $@ $?
 	strip $@
 
-install-lib:
+#################### install
+install-lib: install-miscell install-startup
 	python setup-lib.py install \
-	    --install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
-	    --install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
-	    --install-scripts=$(DESTDIR)/$(bindir)
-	install -m 444 README $(DESTDIR)/$(datadir)/NodeManager
+		--install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
+		--install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
+		--install-scripts=$(DESTDIR)/$(bindir)
+
+# might be better in setup.py ?
+install-miscell:
+	install -d -m 755 $(DESTDIR)/var/lib/nodemanager
+	install -D -m 444 README $(DESTDIR)/$(datadir)/NodeManager/README
+	install -D -m 644 logrotate/nodemanager $(DESTDIR)/etc/logrotate.d/nodemanager
+	install -D -m 755 sshsh $(DESTDIR)/bin/sshsh
+	mkdir -p $(DESTDIR)/$(datadir)/NodeManager/sliver-initscripts
+	rsync -av sliver-initscripts/ $(DESTDIR)/$(datadir)/NodeManager/sliver-initscripts/
+	chmod 755 $(DESTDIR)/$(datadir)/NodeManager/sliver-initscripts/
+
+ifneq "$use_systemd" ""
+install-startup: install-systemd
+else
+install-startup: install-init
+endif
+
+install-init:
+	mkdir -p $(DESTDIR)$(initdir)
+	chmod 755 initscripts/*
+	rsync -av initscripts/ $(DESTDIR)$(initdir)/
+
+install-systemd:
+	mkdir -p $(DESTDIR)/$(systemddir)
+	rsync -av systemd/ $(DESTDIR)/$(systemddir)
 
 install-vs:
 	python setup-vs.py install \
-	    --install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
-	    --install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
-	    --install-scripts=$(DESTDIR)/$(bindir)
+		--install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
+		--install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
+		--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-purelib=$(DESTDIR)/$(datadir)/NodeManager \
+		--install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
+		--install-scripts=$(DESTDIR)/$(bindir)
 	install -m 444 README $(DESTDIR)/$(datadir)/NodeManager
 
+#################### clean
 clean:
 	python setup-lib.py clean
 	python setup-vs.py clean
@@ -60,8 +101,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)
@@ -72,16 +122,26 @@ ifdef NODE
 NODEURL:=root@$(NODE):/
 endif
 
-sync: $(NODE).key.rsa
+# this is for lxc only, we need to exclude the vs stuff that otherwise messes up everything on node
+# keep this in sync with setup-vs.spec
+LXC_EXCLUDES= --exclude sliver_vs.py --exclude coresched_vs.py
+
+sync:synclxc
+
+synclxc: $(NODE).key.rsa
 ifeq (,$(NODEURL))
 	@echo "sync: You must define NODE on the command line"
 	@echo "  e.g. make sync NODE=vnode01.inria.fr"
 	@exit 1
 else
-	+$(RSYNC) --exclude sshsh ./ $(NODEURL)/usr/share/NodeManager/
+	@echo xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+	@echo WARNING : this target might not be very reliable - use with care
+	@echo xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+	+$(RSYNC) --exclude sshsh $(LXC_EXCLUDES) --delete-excluded ./ $(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
+#	+$(RSYNC) ./initscripts/ $(NODEURL)/etc/init.d/
+	+$(RSYNC) ./systemd/ $(NODEURL)/usr/lib/systemd/system/
+#	ssh -i $(NODE).key.rsa root@$(NODE) service nm restart
 endif
 
 ### fetching the key
@@ -104,16 +164,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