Send Linux-ha-cvs mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: resources by xunsun from
([email protected])
2. Linux-HA CVS: lib by blaschke from
([email protected])
3. Linux-HA CVS: lib by blaschke from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 14 Dec 2005 08:39:39 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by xunsun from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : xunsun
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/heartbeat
Modified Files:
IPaddr2.in
Log Message:
split the argument into pieces that IPaddr2 OCF RA can recognize
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/heartbeat/IPaddr2.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- IPaddr2.in 3 Nov 2005 07:45:51 -0000 1.10
+++ IPaddr2.in 14 Dec 2005 15:39:38 -0000 1.11
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: IPaddr2.in,v 1.10 2005/11/03 07:45:51 xunsun Exp $
+# $Id: IPaddr2.in,v 1.11 2005/12/14 15:39:38 xunsun Exp $
#
# Description: wrapper of OCF RA IPaddr2, based on original heartbeat RA.
# See OCF RA IPaddr2 for more information.
@@ -44,6 +44,28 @@
exit 1
fi
+# We need to split the argument into pieces that IPaddr2 OCF RA can
+# recognize, sed is prefered over Bash specific builtin functions
+# for portability.
+
+BASEIP=`echo $1 | sed 's%/.*%%'`
+str=`echo $1 | sed 's%^'$BASEIP'/*%%'`
+
+if [ ! -z "$str" ]; then
+ NETMASK=`echo $str | sed 's%/.*%%'`
+ str=`echo $str | sed 's%^'$NETMASK'/*%%'`
+
+ NIC=`echo $str | sed 's%/.*%%'`
+ case $NIC in
+ [0-9]*) BROADCAST=$NIC
+ NIC=
+ ;;
+ "") ;;
+ *) BROADCAST=`echo $str | sed -e 's%^'$NIC'/*%%' -e 's%/.*%%'`
+ ;;
+ esac
+fi
+
case $2 in
start|stop|status|monitor) ;;
*) usage
@@ -51,4 +73,4 @@
;;
esac
-ra_execocf "rsc_id=IPaddr2_$1" "rsc_type=IPaddr2" "provider=heartbeat" $2
"ip=$1"
+ra_execocf "rsc_id=IPaddr2_$BASEIP" "rsc_type=IPaddr2" "provider=heartbeat"
$2 "ip=$BASEIP" "broadcast=$BROADCAST" "nic=$NIC" "netmask=$NETMASK"
------------------------------
Message: 2
Date: Wed, 14 Dec 2005 11:19:20 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by blaschke from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : blaschke
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/plugins/stonith
Modified Files:
stonith_expect_helpers.h
Log Message:
Marcelo Tosatti's patch to change StonithLookFor to inform the
user what went wrong with parsing.
===================================================================
RCS file:
/home/cvs/linux-ha/linux-ha/lib/plugins/stonith/stonith_expect_helpers.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- stonith_expect_helpers.h 17 Aug 2005 04:26:26 -0000 1.5
+++ stonith_expect_helpers.h 14 Dec 2005 18:19:20 -0000 1.6
@@ -1,4 +1,4 @@
-/* $Id: stonith_expect_helpers.h,v 1.5 2005/08/17 04:26:26 alan Exp $ */
+/* $Id: stonith_expect_helpers.h,v 1.6 2005/12/14 18:19:20 blaschke Exp $ */
/*
* stonith_expect_helpers.h: Some common expect defines.
*
@@ -74,11 +74,13 @@
StonithLookFor(int fd, struct Etoken * tlist, int timeout)
{
int rc;
+ char savebuf[512];
- if ((rc = EXPECT_TOK(fd, tlist, timeout, NULL, 0, Debug)) < 0) {
- LOG(PIL_CRIT, "%s %s %s"
- , "Did not find string", tlist[0].string
- , "from " DEVICE ".");
+ if ((rc = EXPECT_TOK(fd, tlist, timeout, savebuf, sizeof(savebuf)
+ , Debug)) < 0) {
+ LOG(PIL_CRIT, "Did not find string %s from " DEVICE "."
+ , tlist[0].string);
+ LOG(PIL_CRIT, "Received [%s]", savebuf);
}
return(rc);
}
------------------------------
Message: 3
Date: Wed, 14 Dec 2005 11:51:52 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by blaschke from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : blaschke
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/plugins/stonith
Modified Files:
ibmhmc.c
Log Message:
Fix up HMC plugin device description to mention password parameter for
R2 clusters and fix free that was changed.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/stonith/ibmhmc.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- ibmhmc.c 2 Sep 2005 15:36:14 -0000 1.24
+++ ibmhmc.c 14 Dec 2005 18:51:52 -0000 1.25
@@ -613,7 +613,7 @@
mansyspats = OurImports->GetValue(list, ST_MANSYSPAT);
if (mansyspats != NULL) {
if (get_hmc_mansyspats(dev, mansyspats) != S_OK) {
- FREE(namestocopy[1].s_value);
+ FREE(namestocopy[0].s_value);
return S_OOPS;
}
}
@@ -624,7 +624,7 @@
/* -p or -F option with args "ipaddr [managedsyspat]..." */
char *pch = namestocopy[0].s_value;
- /* skip over password and null-terminate */
+ /* skip over ipaddr and null-terminate */
pch += strcspn(pch, WHITESPACE);
*pch = EOS;
@@ -727,7 +727,15 @@
"Optional parameter name " ST_MANSYSPAT " is "
"white-space delimited list of patterns used to match "
"managed system names; if last character is '*', all "
- "names that begin with the pattern are matched\n";
+ "names that begin with the pattern are matched.\n"
+ "Optional parameter name " ST_PASSWD " is password "
+ "for " HMCROOT " if passwordless ssh access to HMC "
+ "has NOT been setup (to do so, it is necessary to "
+ "create a public/private key pair with empty "
+ "passphrase - see \"Configure the OpenSSH Client\" in "
+ "the redbook at " HMCURL " for more details); note "
+ "that passwordless ssh access to HMC must be setup "
+ "for R1 clusters.";
break;
case ST_DEVICEURL:
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 25, Issue 33
********************************************
