From ad119ea8a8bf82cf97c9909301493afd34b2f3f7 Mon Sep 17 00:00:00 2001 From: Ned Bass Date: Tue, 9 Oct 2012 13:10:18 -0700 Subject: [PATCH] LU-107 scripts: rename heartbeat resource agent Add a .ha_v2 extension to the Lustre heartbeat resource agent script to resolve conflicts with the lustre init script on case-insensitive filesystems. The extension also provides a clue as to what the script's purpose is. Add a compatibility symlink with the plain name during package installation. If we later add v3-style scripts we can control which one gets linked to via a configure option. Signed-off-by: Ned Bass Change-Id: I0e37a390fbfb3f00c1c1e666a7cdbe5d37fa885b Reviewed-on: http://review.whamcloud.com/4233 Tested-by: Hudson Reviewed-by: Andreas Dilger Tested-by: Andreas Dilger Reviewed-by: Johann Lombardi Tested-by: Maloo --- lustre.spec.in | 6 ++++++ lustre/scripts/{Lustre => Lustre.ha_v2} | 0 lustre/scripts/Makefile.am | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) rename lustre/scripts/{Lustre => Lustre.ha_v2} (100%) diff --git a/lustre.spec.in b/lustre.spec.in index 1e50a00..05920ce 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -208,6 +208,11 @@ elif [ -e ${llog_base}.o ]; then cp ${llog_base}.o $RPM_BUILD_ROOT/lib/modules/%{kversion}/updates/kernel/fs/lustre fi +# The .ha_v2 extension identifies the heartbeat resource agent as using +# legacy syntax. Install a compatibility symlink to avoid conflicts when +# newer-style agents are added. +ln -s Lustre.ha_v2 $RPM_BUILD_ROOT/etc/ha.d/resource.d/Lustre + # Create the pristine source directory. cd $RPM_BUILD_DIR/lustre-%{version} mkdir -p $RPM_BUILD_ROOT/usr/src @@ -240,6 +245,7 @@ cat >lustre.files <