1 file changed, 3 insertions(+), 1 deletion(-)
tools/hb2openais.sh.in |    4 +++-


# HG changeset patch
# User Andrew Beekhof <[EMAIL PROTECTED]>
# Date 1226662743 -3600
# Branch stable-1.0
# Node ID f148196cd39c565184d649f2d0d8adda5762b0cf
# Parent  16dfe56e86371dbf150ddc338403f4b4dcad050e
# Parent  5d8cd40fed1edaf4e24cc3f53da3a5116324b91a
Hg: Automated merge

diff --git a/tools/hb2openais.sh.in b/tools/hb2openais.sh.in
--- a/tools/hb2openais.sh.in
+++ b/tools/hb2openais.sh.in
@@ -37,7 +37,8 @@ DEFAULT_HA_LOGFACILITY="daemon"
 DEFAULT_HA_LOGFACILITY="daemon"
 export DEFAULT_HA_LOGFACILITY
 AIS_CONF=/etc/ais/openais.conf
-AIS_KEYF=/etc/ais/authkey
+#AIS_KEYF=/etc/ais/authkey
+AIS_KEYF=""
 
 PY_HELPER=$HA_BIN/hb2openais-helper.py
 CRM_VARLIB=$HA_VARLIB/crm
@@ -505,6 +506,7 @@ else
 	openaisconf
 fi
 
+[ "$AIS_KEYF" ] &&
 if [ "$TEST_DIR" ]; then
 	info "Skipping OpenAIS authentication key generation ..."
 else
_______________________________________________
Pacemaker mailing list
Pacemaker@clusterlabs.org
http://list.clusterlabs.org/mailman/listinfo/pacemaker

Reply via email to