From 1a633f38fb0561a9a0701f65af45ea88c8f76a7a Mon Sep 17 00:00:00 2001 From: Thanos Makatos Date: Fri, 5 Dec 2014 12:05:05 +0000 Subject: [PATCH] CP-10439: move xen-ringwatch cron job to blktap Signed-off-by: Thanos Makatos --- Makefile | 5 ----- etc/cron.d/ringwatch | 2 -- mk/sm.spec.in | 1 - 3 files changed, 8 deletions(-) delete mode 100644 etc/cron.d/ringwatch diff --git a/Makefile b/Makefile index 14225785f..47d6f13af 100755 --- a/Makefile +++ b/Makefile @@ -62,8 +62,6 @@ UDEV_RULES = 40-multipath MPATH_DAEMON = sm-multipath MPATH_CONF = multipath.conf -CRON_JOBS += ringwatch - SM_XML := XE_SR_ERRORCODES SM_DEST := /opt/xensource/sm/ @@ -72,7 +70,6 @@ BIN_DEST := /opt/xensource/bin/ MASTER_SCRIPT_DEST := /etc/xensource/master.d/ PLUGIN_SCRIPT_DEST := /etc/xapi.d/plugins/ LIBEXEC := /opt/xensource/libexec/ -CRON_DEST := /etc/cron.d/ UDEV_RULES_DIR := /etc/udev/rules.d/ INIT_DIR := /etc/rc.d/init.d/ MPATH_CONF_DIR := /etc/multipath.xenserver/ @@ -170,8 +167,6 @@ install: precheck $(MAKE) -C snapwatchd install DESTDIR=$(SM_STAGING) $(MAKE) -C mpathroot install DESTDIR=$(SM_STAGING) ln -sf $(SM_DEST)blktap2.py $(SM_STAGING)$(BIN_DEST)/blktap2 - install -m 755 -d $(SM_STAGING)$(CRON_DEST) - install -m 644 $(CRON_JOBS:%=etc/cron.d/%) -t $(SM_STAGING)$(CRON_DEST) ln -sf $(SM_DEST)lcache.py $(SM_STAGING)$(BIN_DEST)tapdisk-cache-stats .PHONY: clean diff --git a/etc/cron.d/ringwatch b/etc/cron.d/ringwatch deleted file mode 100644 index 5c43d1eac..000000000 --- a/etc/cron.d/ringwatch +++ /dev/null @@ -1,2 +0,0 @@ -PATH=/bin:/usr/sbin:/usr/bin:/sbin -*/2 * * * * root xen-ringwatch check -T3 --kick | logger -p daemon.crit -t RINGWATCH-ALERT diff --git a/mk/sm.spec.in b/mk/sm.spec.in index e0bfee8a6..03adf98b9 100755 --- a/mk/sm.spec.in +++ b/mk/sm.spec.in @@ -60,7 +60,6 @@ cp -f /etc/lvm/lvm.conf.orig /etc/lvm/lvm.conf || exit $? %files %defattr(-,root,root,-) -/etc/cron.d/* /etc/rc.d/init.d/snapwatchd /etc/rc.d/init.d/mpathroot /etc/xapi.d/plugins/coalesce-leaf