X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=0b29c8469452f3b7bc0d4f91c4d296bb4095a8f1;hb=7b8fc390afd0349706c45c3ae970770cdf9dceae;hp=7a33f11993fab90217ea0ee735556dfa91c2bd64;hpb=cd0b2a9ec944ac93778f85a470cd357d20e964e2;p=nodemanager.git

diff --git a/Makefile b/Makefile
index 7a33f11..0b29c84 100644
--- a/Makefile
+++ b/Makefile
@@ -9,67 +9,78 @@
 # autoconf compatible variables
 datadir := /usr/share
 bindir := /usr/bin
+initdir=/etc/rc.d/init.d
+systemddir := /usr/lib/systemd/system
 
-lib: forward_api_calls
-	python setup-lib.py build
+PYTHON = python3
 
-vs: 
-	python setup-vs.py build
-
-lxc: 
-	python setup-lxc.py build
+# call with either WITH_SYSTEMD=true or WITH_INIT=true
+# otherwise we try to guess some reasonable default
+ifeq "$(WITH_INIT)$(WITH_SYSTEMD)" ""
+ifeq "$(wildcard $systemddir/*)" ""
+WITH_INIT=true
+else
+WITH_SYSTEMD=true
+endif
+endif
+####################
+all: forward_api_calls
+	$(PYTHON) setup.py build
 
 forward_api_calls: forward_api_calls.c
 	$(CC) -Wall -Os -o $@ $?
 	strip $@
 
-install-lib:
-	python setup-lib.py install \
+#################### install
+install: install-miscell install-startup
+	$(PYTHON) setup.py install \
 		--install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
 		--install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
 		--install-scripts=$(DESTDIR)/$(bindir)
-	install -m 444 README $(DESTDIR)/$(datadir)/NodeManager
 
-install-vs:
-	python setup-vs.py install \
-		--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 -m 444 README $(DESTDIR)/$(datadir)/NodeManager
-
-install-scripts: 
+# might be better in setup.py ?
+# NOTE: the sliver-initscripts/ and sliver-systemd stuff, being, well, for slivers,
+# need to ship on all nodes regardless of WITH_INIT and WITH_SYSTEMD that
+# impacts how nodemanager itself gets started
+install-miscell:
+	install -d -m 755 $(DESTDIR)/var/lib/nodemanager
+	install -D -m 644 /dev/null $(DESTDIR)/etc/sysconfig/nodemanager
+	install -D -m 444 README $(DESTDIR)/$(datadir)/NodeManager/README
+	install -D -m 644 logrotate/nodemanager $(DESTDIR)/etc/logrotate.d/nodemanager
 	mkdir -p $(DESTDIR)/$(datadir)/NodeManager/sliver-initscripts
-	rsync -av sliver-initscripts/ $(DESTDIR)/$(datadir)/sliver-initscripts/
-	chmod 755 $(DESTDIR)/$(datadir)/sliver-initscripts/
+	rsync -av sliver-initscripts/ $(DESTDIR)/$(datadir)/NodeManager/sliver-initscripts/
+	chmod 755 $(DESTDIR)/$(datadir)/NodeManager/sliver-initscripts/
+	mkdir -p $(DESTDIR)/$(datadir)/NodeManager/sliver-systemd
+	rsync -av sliver-systemd/ $(DESTDIR)/$(datadir)/NodeManager/sliver-systemd/
+	chmod 755 $(DESTDIR)/$(datadir)/NodeManager/sliver-systemd/
+
+# this now is for the startup of nodemanager itself
+ifneq "$(WITH_SYSTEMD)" ""
+install-startup: install-systemd
+endif
+ifneq "$(WITH_INIT)" ""
+install-startup: install-init
+endif
 
-	mkdir -p $(DESTDIR)/etc/init.d
+install-init:
+	mkdir -p $(DESTDIR)$(initdir)
 	chmod 755 initscripts/*
-	rsync -av initscripts/ $(DESTDIR)/etc/init.d/
-
-	install -d -m 755 $(DESTDIR)/var/lib/nodemanager
-
-	install -D -m 644 logrotate/nodemanager $(DESTDIR)/etc/logrotate.d/nodemanager
-	install -D -m 755 sshsh $(DESTDIR)/bin/sshsh
+	rsync -av initscripts/ $(DESTDIR)$(initdir)/
 
+install-systemd:
+	mkdir -p $(DESTDIR)/$(systemddir)
+	rsync -av systemd/ $(DESTDIR)/$(systemddir)
 
+#################### clean
 clean:
-	python setup-lib.py clean
-	python setup-vs.py clean
-	python setup-lxc.py clean
+	$(PYTHON) setup.py clean
 	rm -f forward_api_calls *.pyc build
 
 .PHONY: all install clean
 
-##########
+################################################## devel-oriented
 tags:
-	(find . '(' -name '*.py' -o -name '*.c' -o -name '*.spec' ')' ; ls initscripts/*) | xargs etags 
+	git ls-files | xargs etags
 
 .PHONY: tags
 
@@ -87,7 +98,7 @@ tags:
 # and then just run
 # $ make sync
 
-LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' 
+LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc'
 RSYNC_EXCLUDES		:= --exclude .git  --exclude .svn --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
 RSYNC_COND_DRY_RUN	:= $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
 RSYNC			:= rsync -e "ssh -i $(NODE).key.rsa" -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
@@ -96,18 +107,50 @@ 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
+# 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
+SYNC_RESTART=true
+
+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/
-	+$(RSYNC) ./sshsh $(NODEURL)/bin/
-	+$(RSYNC) ./initscripts/nm $(NODEURL)/etc/init.d/nm
-	ssh -i $(NODE).key.rsa root@$(NODE) service nm restart
+	@echo xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+	@echo WARNING : this target might not be very reliable - use with care
+	@echo xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+	+$(RSYNC) $(LXC_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
+
+# 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
@@ -128,3 +171,11 @@ else
 	@echo "FETCHING key"
 	+scp $(KEYURL) $@
 endif
+
+########## exp. too
+SLICE=inri_sl1
+
+syncvinit:
+	$(RSYNC) sliver-systemd/vinit.st* $(NODEURL)/vservers/$(SLICE)/usr/bin/
+	$(RSYNC) sliver-systemd/vinit.service $(NODEURL)/vservers/$(SLICE)/usr/lib/systemd/system/
+	echo "remember to run 'systemctl --system daemon-reload' within this slice"