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: crm by lars from ([email protected])
2. Linux-HA CVS: resources by xunsun from
([email protected])
3. Linux-HA CVS: resources by xunsun from
([email protected])
4. Linux-HA CVS: crm by lars from ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 29 Mar 2006 08:36:10 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm
Modified Files:
crm-1.0.dtd
Log Message:
Fix DTD.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crm-1.0.dtd,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- crm-1.0.dtd 24 Feb 2006 11:30:00 -0000 1.47
+++ crm-1.0.dtd 29 Mar 2006 15:36:09 -0000 1.48
@@ -89,7 +89,7 @@
ordered (true|false) 'true'
collocated (true|false) 'true'>
-<!ELEMENT clone (primitive|group),instance_attributes*>
+<!ELEMENT clone (primitive?,group?,instance_attributes*)>
<!ATTLIST clone
id CDATA #REQUIRED
description CDATA #IMPLIED
@@ -170,7 +170,7 @@
<!ATTLIST expression
id CDATA #REQUIRED
attribute CDATA #REQUIRED
- operation (lt|gt|lte|gte|eq|ne|defined|not_defined)
+ operation (lt|gt|lte|gte|eq|ne|defined|not_defined) #REQUIRED
value CDATA #IMPLIED
type (integer|string|version) 'string'>
<!-- Annotated version -->
@@ -182,7 +182,7 @@
end CDATA #IMPLIED>
<!-- Annotated version -->
-<!ELEMENT date_spec>
+<!ELEMENT date_spec EMPTY>
<!ATTLIST date_spec
monthdays CDATA #IMPLIED
weekdays CDATA #IMPLIED
@@ -193,7 +193,7 @@
years CDATA #IMPLIED
moon CDATA #IMPLIED>
-<!ELEMENT duration>
+<!ELEMENT duration EMPTY>
<!ATTLIST duration
monthdays CDATA #IMPLIED
weekdays CDATA #IMPLIED
@@ -238,13 +238,7 @@
rsc_state CDATA #IMPLIED
transition_key CDATA #IMPLIED
transition_magic CDATA #REQUIRED>
-<!ELEMENT nvpair EMPTY>
-<!ATTLIST nvpair
- id CDATA #REQUIRED
- name CDATA #REQUIRED
- value CDATA #IMPLIED>
-<!ELEMENT parameters>
-<!ELEMENT attributes (nvpair*)>
+<!ELEMENT parameters (nvpair*)>
<!ELEMENT transient_attributes (instance_attributes*)>
<!-- ============================================================== -->
------------------------------
Message: 2
Date: Wed, 29 Mar 2006 08:48:55 -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/OCF
Modified Files:
WinPopup.in
Log Message:
converted HB WinPopup to ocf wrapper, fixed return code of ocf WinPopup
------------------------------
Message: 3
Date: Wed, 29 Mar 2006 08:48:55 -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:
WinPopup.in
Log Message:
converted HB WinPopup to ocf wrapper, fixed return code of ocf WinPopup
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/heartbeat/WinPopup.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- WinPopup.in 29 Jul 2005 07:50:53 -0000 1.2
+++ WinPopup.in 29 Mar 2006 15:48:55 -0000 1.3
@@ -20,58 +20,16 @@
# where "hosts" is a file containing the IPs/Workstation names
# one by line to be sent WinPopups
#
-# License: GPL
-
-ARGS="$0 $*"
-
# Source function library.
-. @sysconfdir@/ha.d/shellfuncs
-
-us=`uname -n`
+. @HB_RA_DIR@/hto-mapfuncs
usage() {
echo "Usage: $0 [workstationfile] {start|stop|status}"
- echo "$Id: WinPopup.in,v 1.2 2005/07/29 07:50:53 sunjd Exp $"
+ echo "$Id: WinPopup.in,v 1.3 2006/03/29 15:48:55 xunsun Exp $"
exit 1
}
-sendWinPopup() {
- # if workstation file exists and is not zero
- if [ -s "$hostfile" ] ; then
- subject=$1
- shift
-
- for i in `cat $hostfile` ; do
- echo "$subject $*" | smbclient -M $i >/dev/null 2>&1
- done
- else
- logger -is -t HA-WinPopup "ERROR: Workstation file $hostfile missing or
corrupt!"
- exit 2
- fi
-}
-
-SubjectLine() {
- case $1 in
- ??*) echo $1;;
- *) echo "Resource Group";;
- esac
-}
-
-
-WinPopupStart() {
-
- Subject="`SubjectLine $2` Takeover in progress on $us"
-
- sendWinPopup "$Subject" $1
-}
-
-WinPopupStop () {
- Subject="`SubjectLine $2` Reestablishing original master connection in
progress on $us"
-
- sendWinPopup "$Subject" $1
-}
-
# max. 2 parameters allowed
if [ $# -gt 2 ] ; then
echo "Additional parameters found: $# but only 2 are allowed!"
@@ -79,7 +37,7 @@
fi
# See how we were called.
-if [ "$1" != "start" -a "$1" != "stop" ] ; then
+if [ $# -eq 2 ] ; then
# optional parameter found
cmd=$2
hostfile=$1
@@ -89,21 +47,15 @@
fi
case "$cmd" in
- start)
- WinPopupStart
+ start|stop)
;;
- stop)
- WinPopupStop
- ;;
-
# Not quite sure what to do with this one...
status)
echo "status not implemented yet"
+ exit 0
;;
-
*)
usage
esac
-exit 0
-
+ra_execocf "rsc_id=WinPopup" "rsc_type=WinPopup" "provider=heartbeat" $cmd
"hostfile=$hostfile"
------------------------------
Message: 4
Date: Wed, 29 Mar 2006 08:56:03 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm
Modified Files:
crm-1.0.dtd
Log Message:
transient_attributes does have an id attribute.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crm-1.0.dtd,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- crm-1.0.dtd 29 Mar 2006 15:36:09 -0000 1.48
+++ crm-1.0.dtd 29 Mar 2006 15:56:02 -0000 1.49
@@ -240,6 +240,8 @@
transition_magic CDATA #REQUIRED>
<!ELEMENT parameters (nvpair*)>
<!ELEMENT transient_attributes (instance_attributes*)>
+<!ATTLIST transient_attributes
+ id CDATA #REQUIRED>
<!-- ============================================================== -->
<!-- ============================================================== -->
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 28, Issue 81
********************************************
