On Sun, Feb 14, 2010 at 02:26:30PM +0100, Thomas Baumann wrote:
> If the following patch is applied, all works like a charm!
>
> --- ocf/resource.d/heartbeat/ldirectord 2010-02-10
> 15:38:51.000000000 +0100
> +++ ocf.tiri/resource.d/heartbeat/ldirectord 2010-02-14
> 14:19:42.000000000 +0100
> @@ -48,8 +48,8 @@
>
> . ${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs
>
> -LDIRCONF=${OCF_RESKEY_configfile:-/usr/sbin/ldirectord/ldirectord.cf}
> -LDIRECTORD=${OCF_RESKEY_ldirectord:-/etc/ldirectord}
> +LDIRCONF=${OCF_RESKEY_configfile:-/etc/ha.d/ldirectord.cf}
> +LDIRECTORD=${OCF_RESKEY_ldirectord:-/usr/sbin/ldirectord}
Hi,
this problem seems to be addressed by
the following change:
# http://hg.linux-ha.org/agents/rev/85191efce8c4
# HG changeset patch
# User andreas.k...@linbit.com
# Date 1264675358 -3600
# Node ID 85191efce8c442f85af5772dea76843a17f9995a
# Parent 1545e3c2275243ff6a7709bc3d53414430907c55
Medium: ldirectord: fix setting defaults for configfile and ldirectord (lf#2328)
diff -r 1545e3c22752 -r 85191efce8c4 ldirectord/OCF/ldirectord.in
--- a/ldirectord/OCF/ldirectord.in Wed Jan 27 17:40:49 2010 +0100
+++ b/ldirectord/OCF/ldirectord.in Thu Jan 28 11:42:38 2010 +0100
@@ -48,8 +48,8 @@
. ${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs
-LDIRCONF=${OCF_RESKEY_configfile:-...@sbindir@/ldirectord/ldirectord.cf}
-LDIRECTORD=${OCF_RESKEY_ldirectord:-...@sysconfdir@/ldirectord}
+LDIRCONF=${OCF_RESKEY_configfile:-...@sysconfdir@/ldirectord/ldirectord.cf}
+LDIRECTORD=${OCF_RESKEY_ldirectord:-...@sbindir@/ldirectord}
meta_data() {
cat <<END
However, ldirectord istelf (as opposed to the OCF wrapper)
has a default configuration file of @sysconfdir@/ha.d/ldirectord.cf,
which has been the default for as long as I can remember.
Should this also be the default in the OCF wrapper?
_______________________________________________
Linux-HA mailing list
Linux-HA@lists.linux-ha.org
http://lists.linux-ha.org/mailman/listinfo/linux-ha
See also: http://linux-ha.org/ReportingProblems
