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: doc by alan from ([email protected])
2. Linux-HA CVS: linux-ha by alan from
([email protected])
3. Linux-HA CVS: website by alan from
([email protected])
4. Linux-HA CVS: resources by alan from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 9 Jun 2006 12:58:25 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: doc by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : doc
Dir : linux-ha/doc
Modified Files:
cibadmin.8.in
Log Message:
Update to cibadmin man page.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/doc/cibadmin.8.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- cibadmin.8.in 1 May 2006 21:09:55 -0000 1.4
+++ cibadmin.8.in 9 Jun 2006 18:58:24 -0000 1.5
@@ -1,4 +1,4 @@
-.TH CIBADMIN 8 "$Date: 2006/05/01 21:09:55 $" "Linux-HA/OpenHA Project"
"Heartbeat @VERSION@ Adminstration Guide"
+.TH CIBADMIN 8 "$Date: 2006/06/09 18:58:24 $" "Linux-HA/OpenHA Project"
"Heartbeat @VERSION@ Adminstration Guide"
.SH NAME
\fIcibadmin\fP \- read, modify, or administer heartbeat Cluster Information
Base
.SH SYNOPSIS
@@ -79,7 +79,7 @@
.TP 8
.B \-\-cib_delete (\-D)
Delete the first object matching the specified criteria.
-e.g., \f(CW</\fItagname\fP id="rsc1_op1" name="monitor"/>\fR.
+e.g., \f(CW<\fItagname\fP id="rsc1_op1" name="monitor"/>\fR.
The tagname and all attributes must match in order for the element to be
deleted.
.TP 8
.B \-\-cib_delete_alt (\-d)
@@ -143,7 +143,7 @@
.nf
\f(CW<primitive id="R_10.10.10.101" class="ocf" type="IPaddr2"
provider="heartbeat">
- <instance_attributes id="RA_R_10.10.10.10">
+ <instance_attributes id="RA_R_10.10.10.101">
<attributes>
<nvpair id="R_ip_P_ip" name="ip" value="10.10.10.101"/>
<nvpair id="R_ip_P_nic" name="nic" value="eth0"/>
------------------------------
Message: 2
Date: Fri, 9 Jun 2006 12:59:53 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
heartbeat.spec.in
Log Message:
Began updating heartbeat.spec.in
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat.spec.in,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -3 -r1.174 -r1.175
--- heartbeat.spec.in 2 May 2006 13:18:07 -0000 1.174
+++ heartbeat.spec.in 9 Jun 2006 18:59:52 -0000 1.175
@@ -1,4 +1,4 @@
-# $Id: heartbeat.spec.in,v 1.174 2006/05/02 13:18:07 alan Exp $
+# $Id: heartbeat.spec.in,v 1.175 2006/06/09 18:59:52 alan Exp $
# Workaround for a change in RPM 4.1.x; needs proper fixing soon!
##%define _unpackaged_files_terminate_build 0
@@ -78,6 +78,19 @@
implementing any number of interfaces.
%changelog
+* Sun May 21 2006 Alan Robertson <[EMAIL PROTECTED]> (see doc/AUTHORS file)
++ Version 2.0.6 - bug fix release
+ + Fixed a long-standing problem where the .src.rpms weren't usable across
+ 32/64-bit boundaries
+ + Added the ability to start/stop groups from the GUI
+ + Fixed a few monitoring bugs in the Apache resource agent
+ + Changed the name of the netmask parameter to the IPaddr and IPaddr2
+ resource agents. This is because the netmask must be specified
+ in CIDR format. The new name is cidr_netmask. It will continue
+ to work the old way.
+ + Changed target_role so that when you stop a resource, all the resources
+ which depend on it also stop - all in the proper order.
+
* Sun Apr 23 2006 Alan Robertson <[EMAIL PROTECTED]> (see doc/AUTHORS file)
+ Version 2.0.5 - significant bug fixes and a few feature deficits fixed
+ various portability fixes
------------------------------
Message: 3
Date: Fri, 9 Jun 2006 13:00:30 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: website by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : website
Dir : linux-ha/website
Modified Files:
print.css
Log Message:
Updated the printing CSS page.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/website/print.css,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- print.css 17 Aug 2005 04:41:07 -0000 1.7
+++ print.css 9 Jun 2006 19:00:29 -0000 1.8
@@ -90,23 +90,28 @@
}
h1 {
font-family: Lucida Sans Typewriter, verdana, lucida sans, FreeSans,
helvetica, sans-serif;
- font-size: 150%;
+ font-size: 200%;
+ font-weight: bold;
width: 99.6%;
}
h2 {
- font-size: 130%;
+ font-size: 150%;
width: 99.2%;
+ font-weight: bold;
}
h3 {
- font-size: 115%;
+ font-size: 130%;
+ font-weight: bold;
width: 98.8%;
}
h4 {
- font-size: 105%;
+ font-size: 115%;
+ text-decoration : underline;
width: 98.4%;
}
h5 {
- font-size: 95%;
+ font-size: 105%;
+ text-decoration : underline;
width: 98.0%;
}
------------------------------
Message: 4
Date: Fri, 9 Jun 2006 13:01:32 -0600 (MDT)
From: [email protected]
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:
IPaddr.in IPaddr2.in
Log Message:
Updated the name of netmask to cidr_netmask
It still accepts the old value.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/IPaddr.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- IPaddr.in 20 Apr 2006 16:33:23 -0000 1.39
+++ IPaddr.in 9 Jun 2006 19:01:32 -0000 1.40
@@ -17,7 +17,7 @@
# OCF_RESKEY_ip
# OCF_RESKEY_broadcast
# OCF_RESKEY_nic
-# OCF_RESKEY_netmask
+# OCF_RESKEY_cidr_netmask
# OCF_RESKEY_lvs_support ( e.g. true, on, 1 )
# OCF_RESKEY_ARP_INTERVAL_MS
# OCF_RESKEY_ARP_REPEAT
@@ -75,7 +75,7 @@
This script manages IP alias IP addresses
It can add an IP alias, or remove one.
</longdesc>
-<shortdesc lang="en">OCF Resource Agent compliant IPaddr script.</shortdesc>
+<shortdesc lang="en">Manages virtual IPv4 addresses</shortdesc>
<parameters>
<parameter name="ip" unique="1" required="1">
@@ -102,9 +102,10 @@
<content type="string" default="eth0"/>
</parameter>
-<parameter name="netmask">
+<parameter name="cidr_netmask">
<longdesc lang="en">
The netmask for the interface in CIDR format.
+(e.g., 24 and not 255.255.255.0)
If unspecified, the script will also try to determine this from the
routing table.
@@ -158,13 +159,13 @@
<longdesc lang="en">
milliseconds between ARPs
</longdesc>
-<shortdesc lang="en">milliseconds between ARPs</shortdesc>
+<shortdesc lang="en">milliseconds between gratuitous ARPs</shortdesc>
<content type="integer" default="500"/>
</parameter>
<parameter name="ARP_REPEAT">
<longdesc lang="en">
-repeat count
+How many gratuitous ARPs to send out when bringing up a new address
</longdesc>
<shortdesc lang="en">repeat count</shortdesc>
<content type="integer" default="10"/>
@@ -180,7 +181,7 @@
<parameter name="ARP_NETMASK">
<longdesc lang="en">
-netmask for ARP
+netmask for ARP - in nonstandard hexadecimal format.
</longdesc>
<shortdesc lang="en">netmask for ARP</shortdesc>
<content type="string" default="ffffffffffff"/>
@@ -208,10 +209,17 @@
#
# $FINDIF can NOT deal with the condition of empty intermediate
parameters.
- #
+ #
+ if
+ [ -n "OCF_RESKEY_netmask" -a -z "OCF_RESKEY_cidr_netmask" ]
+ then
+ ocf_log err "Obsolete parameter netmask supplied"
+ ocf_log info "Please use cidr_netmask instead."
+ OCF_RESKEY_cidr_netmask=$OCF_RESKEY_netmask
+ fi
IFCMD="$FINDIF -C $OCF_RESKEY_ip"
- if [ -n "$OCF_RESKEY_netmask" ]; then
- IFCMD="$IFCMD/$OCF_RESKEY_netmask"
+ if [ -n "$OCF_RESKEY_cidr_netmask" ]; then
+ IFCMD="$IFCMD/$OCF_RESKEY_cidr_netmask"
if [ -n "$OCF_RESKEY_nic" ]; then
IFCMD="$IFCMD/$OCF_RESKEY_nic"
if [ -n "$OCF_RESKEY_broadcast" ]; then
@@ -224,7 +232,7 @@
if [ $? -eq 0 ]; then
OCF_RESKEY_nic=`echo "$NICINFO" | cut -f1`
- OCF_RESKEY_netmask=`echo "$NICINFO" | cut -f2 | cut -d ' ' -f2`
+ OCF_RESKEY_cidr_netmask=`echo "$NICINFO" | cut -f2 | cut -d ' ' -f2`
OCF_RESKEY_broadcast=`echo "$NICINFO" | cut -f3 | cut -d ' ' -f2`
else
ocf_log err "Failed: $IFCMD . Parameter error."
@@ -706,7 +714,8 @@
fi
fi
- add_interface "$OCF_RESKEY_ip" "$OCF_RESKEY_nic" "$NIC_unique"
"$OCF_RESKEY_netmask" "$OCF_RESKEY_broadcast"
+ add_interface "$OCF_RESKEY_ip" "$OCF_RESKEY_nic" "$NIC_unique" \
+ "$OCF_RESKEY_cidr_netmask" "$OCF_RESKEY_broadcast"
rc=$?
if [ $rc != 0 ]; then
return $rc
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/IPaddr2.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- IPaddr2.in 10 Mar 2006 04:14:20 -0000 1.17
+++ IPaddr2.in 9 Jun 2006 19:01:32 -0000 1.18
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: IPaddr2.in,v 1.17 2006/03/10 04:14:20 xunsun Exp $
+# $Id: IPaddr2.in,v 1.18 2006/06/09 19:01:32 alan Exp $
#
# OCF Resource Agent compliant IPaddr2 script.
#
@@ -47,7 +47,7 @@
# OCF_RESKEY_ip
# OCF_RESKEY_broadcast
# OCF_RESKEY_nic
-# OCF_RESKEY_netmask
+# OCF_RESKEY_cidr_netmask
# OCF_RESKEY_iflabel
# OCF_RESKEY_mac
# OCF_RESKEY_incarnations_max_global
@@ -114,9 +114,10 @@
<content type="string" default="eth0"/>
</parameter>
-<parameter name="netmask">
+<parameter name="cidr_netmask">
<longdesc lang="en">
-The netmask for the interface in CIDR format.
+The netmask for the interface in CIDR format
+(e.g., 24 and not 255.255.255.0)
If unspecified, the script will also try to determine this from the
routing table.
@@ -136,7 +137,9 @@
<parameter name="iflabel">
<longdesc lang="en">
-You can specify an additional label for your IP address here. This label is
appended to your interface name. If a label is specified in nic name, this
parameter takes no effect.
+You can specify an additional label for your IP address here.
+This label is appended to your interface name.
+If a label is specified in nic name, this parameter has no effect.
</longdesc>
<shortdesc lang="en">Interface label</shortdesc>
<content type="string" default=""/>
@@ -232,8 +235,15 @@
}
ip_init() {
- if ocf_is_root ; then : ; else
- ocf_log err "You must be root."
+ if
+ case $__OCF_ACTION in
+ start|stop) ocf_is_root;;
+ *) true;;
+ esac
+ then
+ : YAY!
+ else
+ ocf_log err "You must be root for $__OCF_ACTION operation."
exit $OCF_ERR_PERM
fi
@@ -245,7 +255,14 @@
BASEIP="$OCF_RESKEY_ip"
BRDCAST="$OCF_RESKEY_broadcast"
NIC="$OCF_RESKEY_nic"
- NETMASK="$OCF_RESKEY_netmask"
+ if
+ [ -n "$OCF_RESKEY_netmask" -a -z "$OCF_RESKEY_cidr_netmask" ]
+ then
+ ocf_log err "Obsolete parameter netmask supplied"
+ ocf_log info "Please use cidr_netmask instead."
+ OCF_RESKEY_cidr_netmask=$OCF_RESKEY_netmask
+ fi
+ NETMASK="$OCF_RESKEY_cidr_netmask"
IFLABEL="$OCF_RESKEY_iflabel"
IF_MAC="$OCF_RESKEY_mac"
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 31, Issue 32
********************************************
