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 sunjd from 
      ([email protected])
   2. Linux-HA CVS: mgmt by zhenh from 
      ([email protected])
   3. Linux-HA CVS: resources by zhenh from 
      ([email protected])


----------------------------------------------------------------------

Message: 1
Date: Tue, 20 Dec 2005 01:04:22 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by sunjd from 
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>

linux-ha CVS committal

Author  : sunjd
Host    : 
Project : linux-ha
Module  : resources

Dir     : linux-ha/resources/OCF


Modified Files:
        Makefile.am 


Log Message:
remove the redundant item
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Makefile.am 5 Aug 2005 19:34:56 -0000       1.10
+++ Makefile.am 20 Dec 2005 08:04:21 -0000      1.11
@@ -39,8 +39,7 @@
 
 
 
-ocf_SCRIPTS         =  ocf-shellfuncs  \
-                       ClusterMon      \
+ocf_SCRIPTS         =  ClusterMon      \
                        Dummy           \
                        IPaddr          \
                        IPaddr2         \




------------------------------

Message: 2
Date: Tue, 20 Dec 2005 01:16:06 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from 
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>

linux-ha CVS committal

Author  : zhenh
Host    : 
Project : linux-ha
Module  : mgmt

Dir     : linux-ha/mgmt/client


Modified Files:
        haclient.glade haclient.py.in 


Log Message:
add support for description of RA and the required field of paramters
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.glade,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- haclient.glade      12 Dec 2005 02:39:00 -0000      1.4
+++ haclient.glade      20 Dec 2005 08:16:05 -0000      1.5
@@ -2420,7 +2420,7 @@
                  <property name="right_padding">0</property>
 
                  <child>
-                   <widget class="GtkLabel" id="label176">
+                   <widget class="GtkLabel" id="desc">
                      <property name="visible">True</property>
                      <property name="label" translatable="yes"></property>
                      <property name="use_underline">False</property>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.py.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- haclient.py.in      12 Dec 2005 02:39:00 -0000      1.5
+++ haclient.py.in      20 Dec 2005 08:16:05 -0000      1.6
@@ -210,6 +210,7 @@
 class RAMeta :
        name = ""
        version = None
+       desc = ""
        parameters = []
        actions = []
 
@@ -920,11 +921,13 @@
                                       _("Add Parameter"), fields)
 
                self.param_list = param_list
+               glade.get_widget("desc").set_text("")
                if meta != None :
                        for param in meta.parameters :
-                               param["id"] = uuid()
-                               self.param_list.insert(param)
-                       
+                               if param["required"] == "1" :
+                                       param["id"] = uuid()
+                                       self.param_list.insert(param)
+                       glade.get_widget("desc").set_text(meta.desc)
                        
        def on_provider_changed(self, widget, glade) :
                self.update_param_list()
@@ -1527,10 +1530,11 @@
                        return None
                meta_data = ""
                for line in lines :
-                       meta_data = meta_data +line
+                       meta_data = meta_data + line + "\n"
                try :
                        doc_xml = parseString(meta_data).documentElement
                except xml.parsers.expat.ExpatError:
+                       debug("fail to parse the metadata of "+rsc_type)
                        return None
                        
                meta = RAMeta()
@@ -1538,10 +1542,17 @@
 
                version_xml = doc_xml.getElementsByTagName("version")[0]
                meta.version = version_xml.childNodes[0].data
+
+               meta.desc = ""
+               desc_xml = doc_xml.getElementsByTagName("longdesc")
+               if desc_xml != [] and desc_xml[0] in doc_xml.childNodes :
+                       meta.desc = desc_xml[0].childNodes[0].data
+               
                meta.parameters = []
                for param_xml in doc_xml.getElementsByTagName("parameter") :
                        param = {}
                        param["name"] = param_xml.getAttribute("name")
+                       param["required"] = param_xml.getAttribute("required")
                        param["unique"] = param_xml.getAttribute("unique")
                        param["longdesc"] = ""
                        for desc_xml in 
param_xml.getElementsByTagName("longdesc") :




------------------------------

Message: 3
Date: Tue, 20 Dec 2005 01:34:48 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by zhenh from 
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>

linux-ha CVS committal

Author  : zhenh
Host    : 
Project : linux-ha
Module  : resources

Dir     : linux-ha/resources/OCF


Modified Files:
        ClusterMon.in Filesystem.in ICP.in IPaddr.in IPaddr2.in 
        IPsrcaddr.in IPv6addr.c LVM.in LinuxSCSI.in MailTo.in Raid1.in 
        ServeRAID.in WAS.in WinPopup.in Xinetd.in apache.in db2.in 
        drbd.in portblock.in 


Log Message:
add required field to parameters, add description of RA
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/ClusterMon.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ClusterMon.in       27 Sep 2005 10:00:14 -0000      1.6
+++ ClusterMon.in       20 Dec 2005 08:34:47 -0000      1.7
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $Id: ClusterMon.in,v 1.6 2005/09/27 10:00:14 andrew Exp $
+#      $Id: ClusterMon.in,v 1.7 2005/12/20 08:34:47 zhenh Exp $
 #
 #      ClusterMon OCF RA. Does nothing but wait a few seconds, can be
 #      configured to fail occassionally.
@@ -50,6 +50,7 @@
 
 <longdesc lang="en">
 This is a ClusterMon Resource Agent.
+It outputs current cluster status to the html.
 </longdesc>
 <shortdesc lang="en">ClusterMon resource agent</shortdesc>
 
@@ -87,7 +88,7 @@
 <content type="string" default="/tmp/ClusterMon_${OCF_RESOURCE_INSTANCE}.pid" 
/>
 </parameter>
 
-<parameter name="htmlfile" unique="1">
+<parameter name="htmlfile" unique="1" required="1">
 <longdesc lang="en">
 Location to write HTML output to.
 </longdesc>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Filesystem.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Filesystem.in       3 Nov 2005 07:10:04 -0000       1.10
+++ Filesystem.in       20 Dec 2005 08:34:47 -0000      1.11
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: Filesystem.in,v 1.10 2005/11/03 07:10:04 xunsun Exp $
+# $Id: Filesystem.in,v 1.11 2005/12/20 08:34:47 zhenh Exp $
 #
 # Support:      [EMAIL PROTECTED]
 # License:      GNU General Public License (GPL)
@@ -96,7 +96,7 @@
 
 cat <<-EOT;
        usage: $0 {start|stop|status|monitor|validate-all|meta-data}
-       $Id: Filesystem.in,v 1.10 2005/11/03 07:10:04 xunsun Exp $
+       $Id: Filesystem.in,v 1.11 2005/12/20 08:34:47 zhenh Exp $
        EOT
 }
 
@@ -113,7 +113,7 @@
 <shortdesc lang="en">Filesystem resource agent</shortdesc>
 
 <parameters>
-<parameter name="device" unique="0">
+<parameter name="device" unique="0" required="1">
 <longdesc lang="en">
 The name of block device for the filesystem, or -U, -L options for mount, or 
NFS mount specification.
 </longdesc>
@@ -121,7 +121,7 @@
 <content type="string" default="" />
 </parameter>
 
-<parameter name="directory" unique="0">
+<parameter name="directory" unique="0" required="1">
 <longdesc lang="en">
 The mount point for the filesystem.
 </longdesc>
@@ -129,7 +129,7 @@
 <content type="string" default="" />
 </parameter>
 
-<parameter name="fstype" unique="0">
+<parameter name="fstype" unique="0" required="1">
 <longdesc lang="en">
 The optional type of filesystem to be mounted.
 </longdesc>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/ICP.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ICP.in      3 Nov 2005 10:32:47 -0000       1.3
+++ ICP.in      20 Dec 2005 08:34:47 -0000      1.4
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: ICP.in,v 1.3 2005/11/03 10:32:47 xunsun Exp $
+# $Id: ICP.in,v 1.4 2005/12/20 08:34:47 zhenh Exp $
 # 
 # ICP
 #
@@ -53,7 +53,7 @@
        The 'validate-all' operation reports whether OCF instance parameters 
are valid.
        The 'methods' operation reports on the methods $0 supports
 
-       $Id: ICP.in,v 1.3 2005/11/03 10:32:47 xunsun Exp $
+       $Id: ICP.in,v 1.4 2005/12/20 08:34:47 zhenh Exp $
        !
 }
 
@@ -71,7 +71,7 @@
 <shortdesc lang="en">ICP resource agent</shortdesc>
 
 <parameters>
-<parameter name="driveid" unique="0">
+<parameter name="driveid" unique="0" required="1">
 <longdesc lang="en">
 The ICP cluster drive ID.
 </longdesc>
@@ -79,7 +79,7 @@
 <content type="string" default="" />
 </parameter>
 
-<parameter name="device" unique="0">
+<parameter name="device" unique="0" required="1">
 <longdesc lang="en">
 The device name.
 </longdesc>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/IPaddr.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- IPaddr.in   19 Dec 2005 15:11:25 -0000      1.34
+++ IPaddr.in   20 Dec 2005 08:34:47 -0000      1.35
@@ -71,8 +71,14 @@
 <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
 <resource-agent name="IPaddr">
 <version>1.0</version>
+<longdesc lang="en">
+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>
+
 <parameters>
-<parameter name="ip" unique="1">
+<parameter name="ip" unique="1" required="1">
 <longdesc lang="en">
 The IPv4 address to be configured in dotted quad notation, for example
 "192.168.1.1".
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/IPaddr2.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- IPaddr2.in  11 Nov 2005 16:15:02 -0000      1.14
+++ IPaddr2.in  20 Dec 2005 08:34:47 -0000      1.15
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $Id: IPaddr2.in,v 1.14 2005/11/11 16:15:02 davidlee Exp $
+#      $Id: IPaddr2.in,v 1.15 2005/12/20 08:34:47 zhenh Exp $
 #
 #       OCF Resource Agent compliant IPaddr2 script.
 #
@@ -82,8 +82,15 @@
 <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
 <resource-agent name="IPaddr2">
 <version>1.0</version>
+
+<longdesc lang="en">
+OCF Resource Agent compliant IPaddr2 script.
+Implements Cluster Alias IP functionality.
+</longdesc>
+<shortdesc lang="en">OCF Resource Agent compliant IPaddr2 script.</shortdesc>
+
 <parameters>
-<parameter name="ip" unique="1">
+<parameter name="ip" unique="1" required="1">
 <longdesc lang="en">
 The IPv4 address to be configured in dotted quad notation, for example
 "192.168.1.1".
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/IPsrcaddr.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- IPsrcaddr.in        3 Nov 2005 06:44:18 -0000       1.3
+++ IPsrcaddr.in        20 Dec 2005 08:34:47 -0000      1.4
@@ -82,7 +82,7 @@
 <shortdesc lang="en">IPsrcaddr resource agent</shortdesc>
 
 <parameters>
-<parameter name="ipaddress" unique="0">
+<parameter name="ipaddress" unique="0" required="1">
 <longdesc lang="en">
 The IP address. 
 </longdesc>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/IPv6addr.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- IPv6addr.c  23 Aug 2005 04:31:35 -0000      1.8
+++ IPv6addr.c  20 Dec 2005 08:34:47 -0000      1.9
@@ -856,7 +856,7 @@
        "  </longdesc>\n"
        "  <shortdesc lang=\"en\">manages IPv6 alias</shortdesc>\n"
        "  <parameters>\n"
-       "    <parameter name=\"ipv6addr\" unique=\"0\">\n"
+       "    <parameter name=\"ipv6addr\" unique=\"0\" required=\"1\">\n"
        "      <longdesc lang=\"en\">\n"
        "       The IPv6 address this RA will manage \n"
        "      </longdesc>\n"
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/LVM.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- LVM.in      3 Nov 2005 06:44:18 -0000       1.8
+++ LVM.in      20 Dec 2005 08:34:47 -0000      1.9
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: LVM.in,v 1.8 2005/11/03 06:44:18 xunsun Exp $
+# $Id: LVM.in,v 1.9 2005/12/20 08:34:47 zhenh Exp $
 # 
 # LVM
 #
@@ -48,7 +48,7 @@
        The 'validate-all' operation checks whether the OCF parameters are valid
        The 'methods' operation reports on the methods $0 supports
 
-       $Id: LVM.in,v 1.8 2005/11/03 06:44:18 xunsun Exp $
+       $Id: LVM.in,v 1.9 2005/12/20 08:34:47 zhenh Exp $
        !
   exit $OCF_ERR_GENERIC 
 
@@ -68,7 +68,7 @@
 <shortdesc lang="en">LVM resource agent</shortdesc>
 
 <parameters>
-<parameter name="volgrpname" unique="0">
+<parameter name="volgrpname" unique="0" required="1">
 <longdesc lang="en">
 The name of volume group.
 </longdesc>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/LinuxSCSI.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- LinuxSCSI.in        3 Nov 2005 10:32:47 -0000       1.5
+++ LinuxSCSI.in        20 Dec 2005 08:34:47 -0000      1.6
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: LinuxSCSI.in,v 1.5 2005/11/03 10:32:47 xunsun Exp $
+# $Id: LinuxSCSI.in,v 1.6 2005/12/20 08:34:47 zhenh Exp $
 # 
 # LinuxSCSI
 #
@@ -98,7 +98,7 @@
        keep in the volumes.  If you don't use a reasonable volume manager,
        then you'll have to mount by UUID.
 
-       $Id: LinuxSCSI.in,v 1.5 2005/11/03 10:32:47 xunsun Exp $
+       $Id: LinuxSCSI.in,v 1.6 2005/12/20 08:34:47 zhenh Exp $
        !
 }
 
@@ -117,7 +117,7 @@
 <shortdesc lang="en">LinuxSCSI resource agent</shortdesc>
 
 <parameters>
-<parameter name="scsi" unique="0">
+<parameter name="scsi" unique="0" required="1">
 <longdesc lang="en">
 The SCSI instance to be managed.
 </longdesc>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/MailTo.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- MailTo.in   12 Oct 2005 09:06:35 -0000      1.4
+++ MailTo.in   20 Dec 2005 08:34:47 -0000      1.5
@@ -39,7 +39,7 @@
 
 usage() {
   echo "Usage: $0 {start|stop|status|monitor|meta-data|validate-all}"
-  echo "$Id: MailTo.in,v 1.4 2005/10/12 09:06:35 sunjd Exp $"
+  echo "$Id: MailTo.in,v 1.5 2005/12/20 08:34:47 zhenh Exp $"
 }
 
 meta_data() {
@@ -56,7 +56,7 @@
 <shortdesc lang="en">MailTo resource agent</shortdesc>
 
 <parameters>
-<parameter name="email" unique="0">
+<parameter name="email" unique="0" required="1">
 <longdesc lang="en">
 The email address of sysadmin.
 </longdesc>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Raid1.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Raid1.in    3 Nov 2005 10:32:47 -0000       1.4
+++ Raid1.in    20 Dec 2005 08:34:47 -0000      1.5
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: Raid1.in,v 1.4 2005/11/03 10:32:47 xunsun Exp $
+# $Id: Raid1.in,v 1.5 2005/12/20 08:34:47 zhenh Exp $
 #
 # License:      GNU General Public License (GPL)
 # Support:      [EMAIL PROTECTED]
@@ -113,7 +113,7 @@
 usage() {
 cat <<-EOT;
        usage: $0 {start|stop|status|monitor|validate-all|usage|meta-data}
-       $Id: Raid1.in,v 1.4 2005/11/03 10:32:47 xunsun Exp $
+       $Id: Raid1.in,v 1.5 2005/12/20 08:34:47 zhenh Exp $
 EOT
 }
 
@@ -131,7 +131,7 @@
 <shortdesc lang="en">RAID1 resource agent</shortdesc>
 
 <parameters>
-<parameter name="raidconf" unique="0">
+<parameter name="raidconf" unique="0" required="1">
 <longdesc lang="en">
 The name of RAID configuration file. e.g. /etc/raidtab.
 </longdesc>
@@ -139,7 +139,7 @@
 <content type="string" default="" />
 </parameter>
 
-<parameter name="raiddev" unique="0">
+<parameter name="raiddev" unique="0" required="1">
 <longdesc lang="en">
 The block device to use.
 </longdesc>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/ServeRAID.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ServeRAID.in        3 Nov 2005 10:32:47 -0000       1.6
+++ ServeRAID.in        20 Dec 2005 08:34:47 -0000      1.7
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: ServeRAID.in,v 1.6 2005/11/03 10:32:47 xunsun Exp $
+# $Id: ServeRAID.in,v 1.7 2005/12/20 08:34:47 zhenh Exp $
 # 
 # ServeRAID
 #
@@ -104,7 +104,7 @@
        You will need at least version 6.10 (~July 2003 release) of the ipssend
        command for this script to work.
 
-       $Id: ServeRAID.in,v 1.6 2005/11/03 10:32:47 xunsun Exp $
+       $Id: ServeRAID.in,v 1.7 2005/12/20 08:34:47 zhenh Exp $
        !
 }
 
@@ -121,7 +121,7 @@
 <shortdesc lang="en">ServeRAID resource agent</shortdesc>
 
 <parameters>
-<parameter name="serveraid" unique="0">
+<parameter name="serveraid" unique="0" required="1">
 <longdesc lang="en">
 The adapter number of the ServeRAID adapter.
 </longdesc>
@@ -129,7 +129,7 @@
 <content type="integer" default="" />
 </parameter>
 
-<parameter name="mergegroup" unique="0">
+<parameter name="mergegroup" unique="0" required="1">
 <longdesc lang="en">
 The logical drive under consideration. 
 </longdesc>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/WAS.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- WAS.in      7 Nov 2005 15:44:22 -0000       1.6
+++ WAS.in      20 Dec 2005 08:34:47 -0000      1.7
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: WAS.in,v 1.6 2005/11/07 15:44:22 xunsun Exp $
+# $Id: WAS.in,v 1.7 2005/12/20 08:34:47 zhenh Exp $
 # 
 # WAS
 #
@@ -99,7 +99,7 @@
        We run servlet/snoop on the first transport port listed in
        the config file for the "monitor" operation.
 
-       $Id: WAS.in,v 1.6 2005/11/07 15:44:22 xunsun Exp $
+       $Id: WAS.in,v 1.7 2005/12/20 08:34:47 zhenh Exp $
        !
 }
 
@@ -117,7 +117,7 @@
 <shortdesc lang="en">WAS resource agent</shortdesc>
 
 <parameters>
-<parameter name="config" unique="0">
+<parameter name="config" unique="0" required="1">
 <longdesc lang="en">
 The WAS-configuration file.
 </longdesc>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/WinPopup.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- WinPopup.in 11 Oct 2005 09:55:40 -0000      1.4
+++ WinPopup.in 20 Dec 2005 08:34:48 -0000      1.5
@@ -30,7 +30,7 @@
 
 usage() {
   echo "Usage: $0 {start|stop|status|monitor|validate-all|meta-data}"
-  echo "$Id: WinPopup.in,v 1.4 2005/10/11 09:55:40 sunjd Exp $"
+  echo "$Id: WinPopup.in,v 1.5 2005/12/20 08:34:48 zhenh Exp $"
 }
 
 meta_data() {
@@ -47,7 +47,7 @@
 <shortdesc lang="en">WinPopup resource agent</shortdesc>
 
 <parameters>
-<parameter name="hostfile" unique="0">
+<parameter name="hostfile" unique="0" required="1">
 <longdesc lang="en">
 The file containing the hosts to send WinPopup messages to.
 </longdesc>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Xinetd.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Xinetd.in   14 Nov 2005 06:21:24 -0000      1.7
+++ Xinetd.in   20 Dec 2005 08:34:48 -0000      1.8
@@ -43,7 +43,7 @@
 <shortdesc lang="en">Xinetd resource agent</shortdesc>
 
 <parameters>
-<parameter name="service" unique="0">
+<parameter name="service" unique="0" required="1">
 <longdesc lang="en">
 The service name managed by xinetd. 
 </longdesc>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/apache.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- apache.in   18 Nov 2005 05:41:00 -0000      1.11
+++ apache.in   20 Dec 2005 08:34:48 -0000      1.12
@@ -425,6 +425,11 @@
 <resource-agent name="apache">
 <version>1.0</version>
 
+<longdesc lang="en">
+starts/stops apache web servers.
+</longdesc>
+<shortdesc lang="en">starts/stops apache web servers.</shortdesc>
+
 <parameters>
 <parameter name="configfile">
 <longdesc lang="en">
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/db2.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- db2.in      9 Dec 2005 23:35:03 -0000       1.6
+++ db2.in      20 Dec 2005 08:34:48 -0000      1.7
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: db2.in,v 1.6 2005/12/09 23:35:03 gshi Exp $
+# $Id: db2.in,v 1.7 2005/12/20 08:34:48 zhenh Exp $
 # 
 # db2
 #
@@ -48,7 +48,7 @@
        The 'validate-all' operation reports whether the parameters are valid
        The 'methods' operation reports on the methods $0 supports
 
-       $Id: db2.in,v 1.6 2005/12/09 23:35:03 gshi Exp $
+       $Id: db2.in,v 1.7 2005/12/20 08:34:48 zhenh Exp $
        !
 }
 
@@ -65,7 +65,7 @@
 <shortdesc lang="en">db2 resource agent</shortdesc>
 
 <parameters>
-<parameter name="instance" unique="0">
+<parameter name="instance" unique="0" required="1">
 <longdesc lang="en">
 The instance of database.
 </longdesc>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/drbd.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- drbd.in     13 Nov 2005 17:16:43 -0000      1.16
+++ drbd.in     20 Dec 2005 08:34:48 -0000      1.17
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $Id: drbd.in,v 1.16 2005/11/13 17:16:43 davidlee Exp $
+#      $Id: drbd.in,v 1.17 2005/12/20 08:34:48 zhenh Exp $
 #
 #       OCF Resource Agent compliant drbd resource script.
 #
@@ -57,8 +57,14 @@
 <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
 <resource-agent name="drbd">
 <version>1.1</version>
+
+<longdesc lang="en">
+OCF Resource Agent compliant drbd resource script
+</longdesc>
+<shortdesc lang="en">OCF Resource Agent compliant drbd resource 
script</shortdesc>
+
 <parameters>
-<parameter name="drbd_resource" unique="1">
+<parameter name="drbd_resource" unique="1" required="1">
 <longdesc lang="en">
 The name of the drbd resource from the drbd.conf file.
 </longdesc>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/portblock.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- portblock.in        3 Nov 2005 10:32:47 -0000       1.4
+++ portblock.in        20 Dec 2005 08:34:48 -0000      1.5
@@ -72,7 +72,7 @@
 <shortdesc lang="en">portblock resource agent</shortdesc>
 
 <parameters>
-<parameter name="protocol" unique="0">
+<parameter name="protocol" unique="0" required="1">
 <longdesc lang="en">
 The protocol used to be blocked/unblocked.
 </longdesc>
@@ -80,7 +80,7 @@
 <content type="string" default="" />
 </parameter>
 
-<parameter name="portno" unique="0">
+<parameter name="portno" unique="0" required="1">
 <longdesc lang="en">
 The port number used to be blocked/unblocked.
 </longdesc>
@@ -88,7 +88,7 @@
 <content type="integer" default="" />
 </parameter>
 
-<parameter name="action" unique="0">
+<parameter name="action" unique="0" required="1">
 <longdesc lang="en">
 The action (block/unblock) to be done on the protocol::portno.
 </longdesc>




------------------------------

_______________________________________________
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 46
********************************************

Reply via email to