Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
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 alan from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: resources by lars from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: linux-ha by lars from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Thu, 27 Apr 2006 12:07:44 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
drbd.in
Log Message:
Put in a patch to the OCF DRBD resource agent
Thanks to Florian Knauf <[EMAIL PROTECTED]> for the fix!
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/drbd.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- drbd.in 18 Mar 2006 00:54:54 -0000 1.21
+++ drbd.in 27 Apr 2006 18:07:43 -0000 1.22
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: drbd.in,v 1.21 2006/03/18 00:54:54 lars Exp $
+# $Id: drbd.in,v 1.22 2006/04/27 18:07:43 alan Exp $
#
# OCF Resource Agent compliant drbd resource script.
#
@@ -309,24 +309,18 @@
drbd_get_status
- if [ "$DRBD_STATE_LOCAL" = "Not configured" ]; then
- ocf_log debug "$RESOURCE monitor: resource not configured"
- return $OCF_NOT_RUNNING
+ if [ "$DRBD_STATE_LOCAL" == "Not configured" ]; then
+ ocf_log debug "$RESOURCE monitor: resource not configured"
+ return $OCF_NOT_RUNNING
+ elif [ "$DRBD_STATE_LOCAL" == "Primary" ]; then
+ return $OCF_RUNNING_MASTER
+ elif [ "$DRBD_STATE_LOCAL" == "Secondary" ]; then
+ return $OCF_SUCCESS
+ else
+ ocf_log err "$RESOURCE monitor: unexpected local state:
$DRBD_STATE_LOCAL"
fi
- if [ "$DRBD_STATE_LOCAL" != "Secondary" ] \
- && [ "$DRBD_STATE_LOCAL" != "Primary" ]; then
- ocf_log err "$RESOURCE monitor: unexpected local state:
$DRBD_STATE_LOCAL"
- return $OCF_ERR_GENERIC
- fi
-
- ROLE="$OCF_RESKEY_role"
- if [ -n "$ROLE" ] && [ "$DRBD_STATE_LOCAL" != "$ROLE" ]; then
- ocf_log err "$RESOURCE monitor: wrong state: expected $ROLE !=
$DRBD_STATE_LOCAL"
- return $OCF_ERR_GENERIC
- fi
-
- return $OCF_SUCCESS
+ return $OCF_ERR_GENERIC
}
drbd_promote() {
@@ -411,7 +405,7 @@
post)
case $n_op in
start)
- if [ "$n_active_count" -eq 2 ]; then
+ if [ "$n_active" -eq 2 ]; then
# The other side is running, so we ought
# to connect and wait for that.
drbd_start_phase_2 yes
------------------------------
Message: 2
Date: Thu, 27 Apr 2006 13:54:38 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
drbd.in
Log Message:
Fix up path to crm_master.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/drbd.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- drbd.in 27 Apr 2006 18:07:43 -0000 1.22
+++ drbd.in 27 Apr 2006 19:54:37 -0000 1.23
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: drbd.in,v 1.22 2006/04/27 18:07:43 alan Exp $
+# $Id: drbd.in,v 1.23 2006/04/27 19:54:37 lars Exp $
#
# OCF Resource Agent compliant drbd resource script.
#
@@ -158,7 +158,7 @@
drbd_init() {
DRBDADM=$(which drbdadm 2>/dev/null)
- [EMAIL PROTECTED]@/crm_master
+ [EMAIL PROTECTED]@/crm_master
if [ -z "$DRBDADM" -o ! -x "$DRBDADM" ]; then
ocf_log err "drbdadm not installed."
------------------------------
Message: 3
Date: Fri, 28 Apr 2006 05:01:28 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
heartbeat.spec.in
Log Message:
Create a convenience symlink - GUI can be invoked as "hb_gui" (#1164).
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat.spec.in,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -3 -r1.172 -r1.173
--- heartbeat.spec.in 24 Apr 2006 07:25:18 -0000 1.172
+++ heartbeat.spec.in 28 Apr 2006 11:01:27 -0000 1.173
@@ -1,4 +1,4 @@
-# $Id: heartbeat.spec.in,v 1.172 2006/04/24 07:25:18 alan Exp $
+# $Id: heartbeat.spec.in,v 1.173 2006/04/28 11:01:27 lars Exp $
# Workaround for a change in RPM 4.1.x; needs proper fixing soon!
##%define _unpackaged_files_terminate_build 0
@@ -1158,6 +1158,7 @@
(
cd [EMAIL PROTECTED]@/ha.d/resource.d
ln -s @sbindir@/ldirectord ldirectord
+ ln -s @libdir@/heartbeat/haclient.py [EMAIL PROTECTED]@/hb_gui
)
@@ -1201,6 +1202,7 @@
%dir @localstatedir@/run/@HB_PKG@
%attr (2555, @HA_CCMUSER@, @HA_APIGROUP@) @bindir@/cl_status
@bindir@/cl_respawn
[EMAIL PROTECTED]@/hb_gui
@sbindir@/crmadmin
@sbindir@/cibadmin
@sbindir@/ccm_tool
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 145
*********************************************
