From mboxrd@z Thu Jan  1 00:00:00 1970
From: Lon Hohberger <lhh@redhat.com>
Date: Thu,  3 Feb 2011 16:36:32 -0500
Subject: [Cluster-devel] [PATCH] config: Update schema
Message-ID: <1296768992-27438-1-git-send-email-lhh@redhat.com>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

Resolves: rhbz#618705

Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
 config/tools/xml/cluster.rng.in |  827 +++++++++++++++++++++++++++++++++++----
 1 files changed, 747 insertions(+), 80 deletions(-)

diff --git a/config/tools/xml/cluster.rng.in b/config/tools/xml/cluster.rng.in
index 505e07a..8d5b720 100644
--- a/config/tools/xml/cluster.rng.in
+++ b/config/tools/xml/cluster.rng.in
@@ -1011,6 +1011,12 @@ To validate your cluster.conf against this schema, run:
         <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/>
       </optional>
       <optional>
+        <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/>
+      </optional>
+      <optional>
+        <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/>
+      </optional>
+      <optional>
         <ref name="CHILDREN"/>
       </optional>
     </element>
@@ -1038,6 +1044,9 @@ To validate your cluster.conf against this schema, run:
         <optional>
           <attribute name="sleeptime" rha:description="Amount of time (seconds) to sleep."/>
         </optional>
+        <optional>
+          <attribute name="disable_rdisc" rha:description="Disable updating of routing using RDISC protocol"/>
+        </optional>
       </group>
       </choice>
       <optional>
@@ -1053,6 +1062,12 @@ To validate your cluster.conf against this schema, run:
         <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/>
       </optional>
       <optional>
+        <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/>
+      </optional>
+      <optional>
+        <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/>
+      </optional>
+      <optional>
         <ref name="CHILDREN"/>
       </optional>
     </element>
@@ -1105,6 +1120,12 @@ To validate your cluster.conf against this schema, run:
         <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/>
       </optional>
       <optional>
+        <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/>
+      </optional>
+      <optional>
+        <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/>
+      </optional>
+      <optional>
         <ref name="CHILDREN"/>
       </optional>
     </element>
@@ -1144,6 +1165,12 @@ To validate your cluster.conf against this schema, run:
         <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/>
       </optional>
       <optional>
+        <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/>
+      </optional>
+      <optional>
+        <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/>
+      </optional>
+      <optional>
         <ref name="CHILDREN"/>
       </optional>
     </element>
@@ -1178,6 +1205,12 @@ To validate your cluster.conf against this schema, run:
         <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/>
       </optional>
       <optional>
+        <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/>
+      </optional>
+      <optional>
+        <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/>
+      </optional>
+      <optional>
         <ref name="CHILDREN"/>
       </optional>
     </element>
@@ -1223,6 +1256,12 @@ To validate your cluster.conf against this schema, run:
         <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/>
       </optional>
       <optional>
+        <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/>
+      </optional>
+      <optional>
+        <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/>
+      </optional>
+      <optional>
         <ref name="CHILDREN"/>
       </optional>
     </element>
@@ -1273,6 +1312,12 @@ To validate your cluster.conf against this schema, run:
         <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/>
       </optional>
       <optional>
+        <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/>
+      </optional>
+      <optional>
+        <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/>
+      </optional>
+      <optional>
         <ref name="CHILDREN"/>
       </optional>
     </element>
@@ -1318,6 +1363,12 @@ To validate your cluster.conf against this schema, run:
         <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/>
       </optional>
       <optional>
+        <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/>
+      </optional>
+      <optional>
+        <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/>
+      </optional>
+      <optional>
         <ref name="CHILDREN"/>
       </optional>
     </element>
@@ -1363,6 +1414,12 @@ To validate your cluster.conf against this schema, run:
         <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/>
       </optional>
       <optional>
+        <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/>
+      </optional>
+      <optional>
+        <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/>
+      </optional>
+      <optional>
         <ref name="CHILDREN"/>
       </optional>
     </element>
@@ -1408,6 +1465,12 @@ To validate your cluster.conf against this schema, run:
         <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/>
       </optional>
       <optional>
+        <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/>
+      </optional>
+      <optional>
+        <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/>
+      </optional>
+      <optional>
         <ref name="CHILDREN"/>
       </optional>
     </element>
@@ -1456,6 +1519,12 @@ To validate your cluster.conf against this schema, run:
         <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/>
       </optional>
       <optional>
+        <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/>
+      </optional>
+      <optional>
+        <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/>
+      </optional>
+      <optional>
         <ref name="CHILDREN"/>
       </optional>
     </element>
@@ -1501,52 +1570,10 @@ To validate your cluster.conf against this schema, run:
         <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/>
       </optional>
       <optional>
-        <ref name="CHILDREN"/>
-      </optional>
-    </element>
-  </define>
-
-
-  <define name="TOMCAT-5">
-    <element name="tomcat-5" rha:description="Defines a Tomcat server">
-      <choice>
-      <group>
-        <!-- rgmanager specific stuff -->
-        <attribute name="ref" rha:description="Reference to existing tomcat-5 resource in the resources section."/>
-      </group>
-      <group>
-        <attribute name="name" rha:description="Name"/>
-        <optional>
-          <attribute name="config_file" rha:description="Config File"/>
-        </optional>
-        <optional>
-          <attribute name="tomcat_user" rha:description="User who runs the Tomcat server"/>
-        </optional>
-        <optional>
-          <attribute name="catalina_options" rha:description="Other command-line options for Catalina"/>
-        </optional>
-        <optional>
-          <attribute name="catalina_base" rha:description="Catalina base directory (differs for each service)"/>
-        </optional>
-        <optional>
-          <attribute name="shutdown_wait" rha:description="Wait X seconds for correct end of service shutdown"/>
-        </optional>
-        <optional>
-          <attribute name="service_name" rha:description="Inherit the service name."/>
-        </optional>
-      </group>
-      </choice>
-      <optional>
-        <attribute name="__independent_subtree" rha:description="Treat this and all children as an independent subtree."/>
-      </optional>
-      <optional>
-        <attribute name="__enforce_timeouts" rha:description="Consider a timeout for operations as fatal."/>
-      </optional>
-      <optional>
-        <attribute name="__max_failures" rha:description="Maximum number of failures before returning a failure to a status check."/>
+        <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/>
       </optional>
       <optional>
-        <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/>
+        <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/>
       </optional>
       <optional>
         <ref name="CHILDREN"/>
@@ -1588,6 +1615,12 @@ To validate your cluster.conf against this schema, run:
         <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/>
       </optional>
       <optional>
+        <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/>
+      </optional>
+      <optional>
+        <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/>
+      </optional>
+      <optional>
         <ref name="CHILDREN"/>
       </optional>
     </element>
@@ -1628,6 +1661,12 @@ To validate your cluster.conf against this schema, run:
         <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/>
       </optional>
       <optional>
+        <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/>
+      </optional>
+      <optional>
+        <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/>
+      </optional>
+      <optional>
         <ref name="CHILDREN"/>
       </optional>
     </element>
@@ -1712,6 +1751,12 @@ To validate your cluster.conf against this schema, run:
         <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/>
       </optional>
       <optional>
+        <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/>
+      </optional>
+      <optional>
+        <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/>
+      </optional>
+      <optional>
         <ref name="CHILDREN"/>
       </optional>
     </element>
@@ -1769,6 +1814,12 @@ To validate your cluster.conf against this schema, run:
         <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/>
       </optional>
       <optional>
+        <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/>
+      </optional>
+      <optional>
+        <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/>
+      </optional>
+      <optional>
         <ref name="CHILDREN"/>
       </optional>
     </element>
@@ -1839,6 +1890,12 @@ To validate your cluster.conf against this schema, run:
         <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/>
       </optional>
       <optional>
+        <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/>
+      </optional>
+      <optional>
+        <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/>
+      </optional>
+      <optional>
         <ref name="CHILDREN"/>
       </optional>
     </element>
@@ -1887,6 +1944,12 @@ To validate your cluster.conf against this schema, run:
         <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/>
       </optional>
       <optional>
+        <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/>
+      </optional>
+      <optional>
+        <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/>
+      </optional>
+      <optional>
         <ref name="CHILDREN"/>
       </optional>
     </element>
@@ -1927,6 +1990,12 @@ To validate your cluster.conf against this schema, run:
         <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/>
       </optional>
       <optional>
+        <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/>
+      </optional>
+      <optional>
+        <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/>
+      </optional>
+      <optional>
         <ref name="CHILDREN"/>
       </optional>
     </element>
@@ -1963,6 +2032,94 @@ To validate your cluster.conf against this schema, run:
         <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/>
       </optional>
       <optional>
+        <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/>
+      </optional>
+      <optional>
+        <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/>
+      </optional>
+      <optional>
+        <ref name="CHILDREN"/>
+      </optional>
+    </element>
+  </define>
+
+
+  <define name="ORAINSTANCE">
+    <element name="orainstance" rha:description="Oracle 10g Failover Instance">
+      <choice>
+      <group>
+        <!-- rgmanager specific stuff -->
+        <attribute name="ref" rha:description="Reference to existing orainstance resource in the resources section."/>
+      </group>
+      <group>
+        <attribute name="name" rha:description="Oracle SID"/>
+        <attribute name="user" rha:description="Oracle User Name"/>
+        <attribute name="home" rha:description="Oracle Home Directory"/>
+        <optional>
+          <attribute name="listeners" rha:description="Oracle listeners"/>
+        </optional>
+        <optional>
+          <attribute name="lockfile" rha:description="Pathname for lockfile"/>
+        </optional>
+      </group>
+      </choice>
+      <optional>
+        <attribute name="__independent_subtree" rha:description="Treat this and all children as an independent subtree."/>
+      </optional>
+      <optional>
+        <attribute name="__enforce_timeouts" rha:description="Consider a timeout for operations as fatal."/>
+      </optional>
+      <optional>
+        <attribute name="__max_failures" rha:description="Maximum number of failures before returning a failure to a status check."/>
+      </optional>
+      <optional>
+        <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/>
+      </optional>
+      <optional>
+        <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/>
+      </optional>
+      <optional>
+        <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/>
+      </optional>
+      <optional>
+        <ref name="CHILDREN"/>
+      </optional>
+    </element>
+  </define>
+
+
+  <define name="ORALISTENER">
+    <element name="oralistener" rha:description="Oracle 10g Listener Instance">
+      <choice>
+      <group>
+        <!-- rgmanager specific stuff -->
+        <attribute name="ref" rha:description="Reference to existing oralistener resource in the resources section."/>
+      </group>
+      <group>
+        <attribute name="name" rha:description="Listener name"/>
+        <attribute name="user" rha:description="Oracle User Name"/>
+        <attribute name="home" rha:description="Oracle Home Directory"/>
+      </group>
+      </choice>
+      <optional>
+        <attribute name="__independent_subtree" rha:description="Treat this and all children as an independent subtree."/>
+      </optional>
+      <optional>
+        <attribute name="__enforce_timeouts" rha:description="Consider a timeout for operations as fatal."/>
+      </optional>
+      <optional>
+        <attribute name="__max_failures" rha:description="Maximum number of failures before returning a failure to a status check."/>
+      </optional>
+      <optional>
+        <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/>
+      </optional>
+      <optional>
+        <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/>
+      </optional>
+      <optional>
+        <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/>
+      </optional>
+      <optional>
         <ref name="CHILDREN"/>
       </optional>
     </element>
@@ -2019,6 +2176,12 @@ To validate your cluster.conf against this schema, run:
         <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/>
       </optional>
       <optional>
+        <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/>
+      </optional>
+      <optional>
+        <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/>
+      </optional>
+      <optional>
         <ref name="CHILDREN"/>
       </optional>
     </element>
@@ -2060,6 +2223,12 @@ To validate your cluster.conf against this schema, run:
         <attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/>
       </optional>
       <optional>
+        <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/>
+      </optional>
+      <optional>
+        <attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/>
+      </optional>
+      <optional>
         <ref name="CHILDREN"/>
       </optional>
     </element>
@@ -2081,7 +2250,6 @@ To validate your cluster.conf against this schema, run:
         <ref name="SAMBA"/>
         <ref name="MYSQL"/>
         <ref name="POSTGRES-8"/>
-        <ref name="TOMCAT-5"/>
         <ref name="TOMCAT-6"/>
         <ref name="LVM"/>
         <ref name="VM"/>
@@ -2090,6 +2258,8 @@ To validate your cluster.conf against this schema, run:
         <ref name="NAMED"/>
         <ref name="ASEHAAGENT"/>
         <ref name="NFSSERVER"/>
+        <ref name="ORAINSTANCE"/>
+        <ref name="ORALISTENER"/>
         <ref name="FS"/>
         <ref name="ORACLEDB"/>
       <ref name="RESOURCEACTION"/>
@@ -2186,8 +2356,10 @@ To validate your cluster.conf against this schema, run:
        the impilan fence device.-->
        <!-- Brocade, McData, SANBox2, Bladecenter,bullpap, ipmilan -->
        <group>
+        <optional>
         <attribute name="ipaddr" rha:description="IP address or the name
             of the device." rha:sample="rack007"/>
+        </optional>
         <optional>
         <attribute name="login" rha:description="The login name used to
             access the device. " rha:sample="admin"/>
@@ -2419,6 +2591,9 @@ To validate your cluster.conf against this schema, run:
           <attribute name="secure" rha:description="SSH connection" />
         </optional>
         <optional>
+          <attribute name="identity_file" rha:description="Identity file for ssh" />
+        </optional>
+        <optional>
           <attribute name="vmware_datacenter" rha:description="Show only machines in specified datacenter" />
         </optional>
         <optional>
@@ -2436,6 +2611,24 @@ To validate your cluster.conf against this schema, run:
         <optional>
           <attribute name="separator" rha:description="Separator for CSV created by operation list" />
         </optional>
+        <optional>
+          <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" />
+        </optional>
+        <optional>
+          <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" />
+        </optional>
+        <optional>
+          <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
+        </optional>
+        <optional>
+          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
+        </optional>
       </group>
 
 
@@ -2463,6 +2656,9 @@ To validate your cluster.conf against this schema, run:
           <attribute name="secure" rha:description="SSH connection" />
         </optional>
         <optional>
+          <attribute name="identity_file" rha:description="Identity file for ssh" />
+        </optional>
+        <optional>
           <attribute name="partition" rha:description="Partition name" />
         </optional>
         <optional>
@@ -2498,6 +2694,24 @@ To validate your cluster.conf against this schema, run:
         <optional>
           <attribute name="separator" rha:description="Separator for CSV created by operation list" />
         </optional>
+        <optional>
+          <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" />
+        </optional>
+        <optional>
+          <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" />
+        </optional>
+        <optional>
+          <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
+        </optional>
+        <optional>
+          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
+        </optional>
       </group>
 
 
@@ -2557,6 +2771,27 @@ To validate your cluster.conf against this schema, run:
         <optional>
           <attribute name="separator" rha:description="Separator for CSV created by operation list" />
         </optional>
+        <optional>
+          <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" />
+        </optional>
+        <optional>
+          <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" />
+        </optional>
+        <optional>
+          <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="missing_as_off" rha:description="Missing port returns OFF instead of failure" />
+        </optional>
+        <optional>
+          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
+        </optional>
+        <optional>
+          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
+        </optional>
       </group>
 
 
@@ -2628,6 +2863,24 @@ To validate your cluster.conf against this schema, run:
         <optional>
           <attribute name="separator" rha:description="Separator for CSV created by operation list" />
         </optional>
+        <optional>
+          <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" />
+        </optional>
+        <optional>
+          <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" />
+        </optional>
+        <optional>
+          <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
+        </optional>
+        <optional>
+          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
+        </optional>
       </group>
 
 
@@ -2699,11 +2952,29 @@ To validate your cluster.conf against this schema, run:
         <optional>
           <attribute name="separator" rha:description="Separator for CSV created by operation list" />
         </optional>
-      </group>
-
-
-      <!-- fence_eps -->
-      <group>
+        <optional>
+          <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" />
+        </optional>
+        <optional>
+          <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" />
+        </optional>
+        <optional>
+          <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
+        </optional>
+        <optional>
+          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
+        </optional>
+      </group>
+
+
+      <!-- fence_eps -->
+      <group>
         <optional>
           <attribute name="option"/> <!-- deprecated; for compatibility.  use "action" -->
         </optional>
@@ -2726,6 +2997,9 @@ To validate your cluster.conf against this schema, run:
           <attribute name="port" rha:description="Physical plug number or name of virtual machine" />
         </optional>
         <optional>
+          <attribute name="hidden_page" rha:description="Name of hidden page" />
+        </optional>
+        <optional>
           <attribute name="verbose" rha:description="Verbose mode" />
         </optional>
         <optional>
@@ -2740,6 +3014,12 @@ To validate your cluster.conf against this schema, run:
         <optional>
           <attribute name="separator" rha:description="Separator for CSV created by operation list" />
         </optional>
+        <optional>
+          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
+        </optional>
+        <optional>
+          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
+        </optional>
       </group>
 
 
@@ -2799,49 +3079,121 @@ To validate your cluster.conf against this schema, run:
         <optional>
           <attribute name="separator" rha:description="Separator for CSV created by operation list" />
         </optional>
+        <optional>
+          <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" />
+        </optional>
+        <optional>
+          <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" />
+        </optional>
+        <optional>
+          <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
+        </optional>
+        <optional>
+          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
+        </optional>
       </group>
 
+      <!-- No metadata for fence_xcat -->
+      <!-- No metadata for fence_rackswitch -->
+      <!-- No metadata for fence_rsb -->
 
-      <!-- fence_ipmilan -->
+      <!-- fence_bladecenter_snmp -->
       <group>
         <optional>
           <attribute name="option"/> <!-- deprecated; for compatibility.  use "action" -->
         </optional>
         <optional>
-          <attribute name="auth" rha:description="IPMI Lan Auth type (md5, password, or none)" />
+          <attribute name="action" rha:description="Fencing Action" />
         </optional>
         <optional>
-          <attribute name="ipaddr" rha:description="IPMI Lan IP to talk to" />
+          <attribute name="ipaddr" rha:description="IP Address or Hostname" />
         </optional>
         <optional>
-          <attribute name="passwd" rha:description="Password (if required) to control power on IPMI device" />
+          <attribute name="login" rha:description="Login Name" />
         </optional>
         <optional>
-          <attribute name="passwd_script" rha:description="Script to retrieve password (if required)" />
+          <attribute name="passwd" rha:description="Login password or passphrase" />
         </optional>
         <optional>
-          <attribute name="lanplus" rha:description="Use Lanplus" />
+          <attribute name="passwd_script" rha:description="Script to retrieve password" />
         </optional>
         <optional>
-          <attribute name="login" rha:description="Username/Login (if required) to control power on IPMI device" />
+          <attribute name="port" rha:description="Physical plug number or name of virtual machine" />
         </optional>
         <optional>
-          <attribute name="action" rha:description="Operation to perform. Valid operations: on, off, reboot, status, list, monitor or metadata" />
+          <attribute name="snmp_version" rha:description="Specifies SNMP version to use (1,2c,3)" />
         </optional>
         <optional>
-          <attribute name="timeout" rha:description="Timeout (sec) for IPMI operation" />
+          <attribute name="community" rha:description="Set the community string" />
         </optional>
         <optional>
-          <attribute name="cipher" rha:description="Ciphersuite to use (same as ipmitool -C parameter)" />
+          <attribute name="snmp_auth_prot" rha:description="Set authentication protocol (MD5|SHA)" />
         </optional>
         <optional>
-          <attribute name="method" rha:description="Method to fence (onoff or cycle)" />
+          <attribute name="snmp_sec_level" rha:description="Set security level (noAuthNoPriv|authNoPriv|authPriv)" />
+        </optional>
+        <optional>
+          <attribute name="snmp_priv_prot" rha:description="Set privacy protocol (DES|AES)" />
+        </optional>
+        <optional>
+          <attribute name="snmp_priv_passwd" rha:description="Set privacy protocol password" />
+        </optional>
+        <optional>
+          <attribute name="snmp_priv_passwd_script" rha:description="Script to run to retrieve privacy password" />
+        </optional>
+        <optional>
+          <attribute name="udpport" rha:description="UDP/TCP port to use for connection with device" />
+        </optional>
+        <optional>
+          <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" />
+        </optional>
+        <optional>
+          <attribute name="inet6_only" rha:description="Forces agent to use IPv6 addresses only" />
         </optional>
         <optional>
           <attribute name="verbose" rha:description="Verbose mode" />
         </optional>
+        <optional>
+          <attribute name="debug" rha:description="Write debug information to given file" />
+        </optional>
+        <optional>
+          <attribute name="version" rha:description="Display version information and exit" />
+        </optional>
+        <optional>
+          <attribute name="help" rha:description="Display help and exit" />
+        </optional>
+        <optional>
+          <attribute name="separator" rha:description="Separator for CSV created by operation list" />
+        </optional>
+        <optional>
+          <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" />
+        </optional>
+        <optional>
+          <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" />
+        </optional>
+        <optional>
+          <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
+        </optional>
+        <optional>
+          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
+        </optional>
       </group>
 
+      <!-- No metadata for fence_cpint -->
+      <!-- No metadata for fence_drac -->
+      <!-- No metadata for fence_ipmilan -->
 
       <!-- fence_rsa -->
       <group>
@@ -2870,9 +3222,80 @@ To validate your cluster.conf against this schema, run:
           <attribute name="secure" rha:description="SSH connection" />
         </optional>
         <optional>
+          <attribute name="identity_file" rha:description="Identity file for ssh" />
+        </optional>
+        <optional>
+          <attribute name="ipport" rha:description="TCP port to use for connection with device" />
+        </optional>
+        <optional>
+          <attribute name="verbose" rha:description="Verbose mode" />
+        </optional>
+        <optional>
+          <attribute name="debug" rha:description="Write debug information to given file" />
+        </optional>
+        <optional>
+          <attribute name="version" rha:description="Display version information and exit" />
+        </optional>
+        <optional>
+          <attribute name="help" rha:description="Display help and exit" />
+        </optional>
+        <optional>
+          <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" />
+        </optional>
+        <optional>
+          <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" />
+        </optional>
+        <optional>
+          <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
+        </optional>
+        <optional>
+          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
+        </optional>
+      </group>
+
+
+      <!-- fence_cisco_ucs -->
+      <group>
+        <optional>
+          <attribute name="option"/> <!-- deprecated; for compatibility.  use "action" -->
+        </optional>
+        <optional>
+          <attribute name="action" rha:description="Fencing Action" />
+        </optional>
+        <optional>
+          <attribute name="ipaddr" rha:description="IP Address or Hostname" />
+        </optional>
+        <optional>
+          <attribute name="login" rha:description="Login Name" />
+        </optional>
+        <optional>
+          <attribute name="passwd" rha:description="Login password or passphrase" />
+        </optional>
+        <optional>
+          <attribute name="passwd_script" rha:description="Script to retrieve password" />
+        </optional>
+        <optional>
+          <attribute name="ssl" rha:description="SSL connection" />
+        </optional>
+        <optional>
+          <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" />
+        </optional>
+        <optional>
+          <attribute name="inet6_only" rha:description="Forces agent to use IPv6 addresses only" />
+        </optional>
+        <optional>
           <attribute name="ipport" rha:description="TCP port to use for connection with device" />
         </optional>
         <optional>
+          <attribute name="port" rha:description="Physical plug number or name of virtual machine" />
+        </optional>
+        <optional>
           <attribute name="verbose" rha:description="Verbose mode" />
         </optional>
         <optional>
@@ -2884,6 +3307,24 @@ To validate your cluster.conf against this schema, run:
         <optional>
           <attribute name="help" rha:description="Display help and exit" />
         </optional>
+        <optional>
+          <attribute name="separator" rha:description="Separator for CSV created by operation list" />
+        </optional>
+        <optional>
+          <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" />
+        </optional>
+        <optional>
+          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
+        </optional>
+        <optional>
+          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
+        </optional>
       </group>
 
 
@@ -2940,8 +3381,28 @@ To validate your cluster.conf against this schema, run:
         <optional>
           <attribute name="separator" rha:description="Separator for CSV created by operation list" />
         </optional>
+        <optional>
+          <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" />
+        </optional>
+        <optional>
+          <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" />
+        </optional>
+        <optional>
+          <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
+        </optional>
+        <optional>
+          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
+        </optional>
       </group>
 
+      <!-- No metadata for fence_mcdata -->
+      <!-- No metadata for fence_bullpap -->
 
       <!-- fence_wti -->
       <group>
@@ -2970,6 +3431,9 @@ To validate your cluster.conf against this schema, run:
           <attribute name="secure" rha:description="SSH connection" />
         </optional>
         <optional>
+          <attribute name="identity_file" rha:description="Identity file for ssh" />
+        </optional>
+        <optional>
           <attribute name="port" rha:description="Physical plug number or name of virtual machine" />
         </optional>
         <optional>
@@ -2996,8 +3460,27 @@ To validate your cluster.conf against this schema, run:
         <optional>
           <attribute name="separator" rha:description="Separator for CSV created by operation list" />
         </optional>
+        <optional>
+          <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" />
+        </optional>
+        <optional>
+          <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" />
+        </optional>
+        <optional>
+          <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
+        </optional>
+        <optional>
+          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
+        </optional>
       </group>
 
+      <!-- No metadata for fence_zvm -->
 
       <!-- fence_drac5 -->
       <group>
@@ -3026,6 +3509,9 @@ To validate your cluster.conf against this schema, run:
           <attribute name="secure" rha:description="SSH connection" />
         </optional>
         <optional>
+          <attribute name="identity_file" rha:description="Identity file for ssh" />
+        </optional>
+        <optional>
           <attribute name="drac_version" rha:description="Force DRAC version to use" />
         </optional>
         <optional>
@@ -3055,8 +3541,55 @@ To validate your cluster.conf against this schema, run:
         <optional>
           <attribute name="separator" rha:description="Separator for CSV created by operation list" />
         </optional>
+        <optional>
+          <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" />
+        </optional>
+        <optional>
+          <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" />
+        </optional>
+        <optional>
+          <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
+        </optional>
+        <optional>
+          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
+        </optional>
       </group>
 
+      <!-- No metadata for fence_vixel -->
+      <!-- No metadata for fence_baytech -->
+
+      <!-- fence_scsi -->
+      <group>
+        <optional>
+          <attribute name="option"/> <!-- deprecated; for compatibility.  use "action" -->
+        </optional>
+        <optional>
+          <attribute name="aptpl" rha:description="Use APTPL flag for registrations" />
+        </optional>
+        <optional>
+          <attribute name="devices" rha:description="List of devices to be used for fencing action" />
+        </optional>
+        <optional>
+          <attribute name="logfile" rha:description="File to write error/debug messages" />
+        </optional>
+        <optional>
+          <attribute name="key" rha:description="Key value to be used for fencing action" />
+        </optional>
+        <optional>
+          <attribute name="action" rha:description="Fencing action" />
+        </optional>
+        <optional>
+          <attribute name="nodename" rha:description="Name of node" />
+        </optional>
+      </group>
+
+      <!-- No metadata for fence_brocade -->
 
       <!-- fence_ilo_mp -->
       <group>
@@ -3082,6 +3615,9 @@ To validate your cluster.conf against this schema, run:
           <attribute name="secure" rha:description="SSH connection" />
         </optional>
         <optional>
+          <attribute name="identity_file" rha:description="Identity file for ssh" />
+        </optional>
+        <optional>
           <attribute name="cmd_prompt" rha:description="Force command prompt" />
         </optional>
         <optional>
@@ -3108,6 +3644,24 @@ To validate your cluster.conf against this schema, run:
         <optional>
           <attribute name="separator" rha:description="Separator for CSV created by operation list" />
         </optional>
+        <optional>
+          <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" />
+        </optional>
+        <optional>
+          <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" />
+        </optional>
+        <optional>
+          <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
+        </optional>
+        <optional>
+          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
+        </optional>
       </group>
 
 
@@ -3138,6 +3692,9 @@ To validate your cluster.conf against this schema, run:
           <attribute name="port" rha:description="Physical plug number or name of virtual machine" />
         </optional>
         <optional>
+          <attribute name="identity_file" rha:description="Identity file for ssh" />
+        </optional>
+        <optional>
           <attribute name="switch" rha:description="Physical switch number on device" />
         </optional>
         <optional>
@@ -3164,6 +3721,24 @@ To validate your cluster.conf against this schema, run:
         <optional>
           <attribute name="separator" rha:description="Separator for CSV created by operation list" />
         </optional>
+        <optional>
+          <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" />
+        </optional>
+        <optional>
+          <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" />
+        </optional>
+        <optional>
+          <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
+        </optional>
+        <optional>
+          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
+        </optional>
       </group>
 
 
@@ -3191,6 +3766,9 @@ To validate your cluster.conf against this schema, run:
           <attribute name="secure" rha:description="SSH connection" />
         </optional>
         <optional>
+          <attribute name="identity_file" rha:description="Identity file for ssh" />
+        </optional>
+        <optional>
           <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" />
         </optional>
         <optional>
@@ -3211,10 +3789,28 @@ To validate your cluster.conf against this schema, run:
         <optional>
           <attribute name="help" rha:description="Display help and exit" />
         </optional>
+        <optional>
+          <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" />
+        </optional>
+        <optional>
+          <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" />
+        </optional>
+        <optional>
+          <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
+        </optional>
+        <optional>
+          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
+        </optional>
       </group>
 
 
-      <!-- fence_ibmblade -->
+      <!-- fence_rhevm -->
       <group>
         <optional>
           <attribute name="option"/> <!-- deprecated; for compatibility.  use "action" -->
@@ -3235,55 +3831,53 @@ To validate your cluster.conf against this schema, run:
           <attribute name="passwd_script" rha:description="Script to retrieve password" />
         </optional>
         <optional>
-          <attribute name="port" rha:description="Physical plug number or name of virtual machine" />
-        </optional>
-        <optional>
-          <attribute name="snmp_version" rha:description="Specifies SNMP version to use (1,2c,3)" />
+          <attribute name="ssl" rha:description="SSL connection" />
         </optional>
         <optional>
-          <attribute name="community" rha:description="Set the community string" />
+          <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" />
         </optional>
         <optional>
-          <attribute name="snmp_auth_prot" rha:description="Set authentication protocol (MD5|SHA)" />
+          <attribute name="inet6_only" rha:description="Forces agent to use IPv6 addresses only" />
         </optional>
         <optional>
-          <attribute name="snmp_sec_level" rha:description="Set security level (noAuthNoPriv|authNoPriv|authPriv)" />
+          <attribute name="ipport" rha:description="TCP port to use for connection with device" />
         </optional>
         <optional>
-          <attribute name="snmp_priv_prot" rha:description="Set privacy protocol (DES|AES)" />
+          <attribute name="port" rha:description="Physical plug number or name of virtual machine" />
         </optional>
         <optional>
-          <attribute name="snmp_priv_passwd" rha:description="Set privacy protocol password" />
+          <attribute name="verbose" rha:description="Verbose mode" />
         </optional>
         <optional>
-          <attribute name="snmp_priv_passwd_script" rha:description="Script to run to retrieve privacy password" />
+          <attribute name="debug" rha:description="Write debug information to given file" />
         </optional>
         <optional>
-          <attribute name="udpport" rha:description="UDP/TCP port to use for connection with device" />
+          <attribute name="version" rha:description="Display version information and exit" />
         </optional>
         <optional>
-          <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" />
+          <attribute name="help" rha:description="Display help and exit" />
         </optional>
         <optional>
-          <attribute name="inet6_only" rha:description="Forces agent to use IPv6 addresses only" />
+          <attribute name="separator" rha:description="Separator for CSV created by operation list" />
         </optional>
         <optional>
-          <attribute name="verbose" rha:description="Verbose mode" />
+          <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" />
         </optional>
         <optional>
-          <attribute name="debug" rha:description="Write debug information to given file" />
+          <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" />
         </optional>
         <optional>
-          <attribute name="version" rha:description="Display version information and exit" />
+          <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" />
         </optional>
         <optional>
-          <attribute name="help" rha:description="Display help and exit" />
+          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
         </optional>
         <optional>
-          <attribute name="separator" rha:description="Separator for CSV created by operation list" />
+          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
         </optional>
       </group>
 
+      <!-- No metadata for fence_ibmblade -->
 
       <!-- fence_sanbox2 -->
       <group>
@@ -3329,8 +3923,27 @@ To validate your cluster.conf against this schema, run:
         <optional>
           <attribute name="separator" rha:description="Separator for CSV created by operation list" />
         </optional>
+        <optional>
+          <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" />
+        </optional>
+        <optional>
+          <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" />
+        </optional>
+        <optional>
+          <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
+        </optional>
+        <optional>
+          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
+        </optional>
       </group>
 
+      <!-- No metadata for fence_egenera -->
 
       <!-- fence_apc_snmp -->
       <group>
@@ -3400,6 +4013,24 @@ To validate your cluster.conf against this schema, run:
         <optional>
           <attribute name="separator" rha:description="Separator for CSV created by operation list" />
         </optional>
+        <optional>
+          <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" />
+        </optional>
+        <optional>
+          <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" />
+        </optional>
+        <optional>
+          <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
+        </optional>
+        <optional>
+          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
+        </optional>
       </group>
 
 
@@ -3450,6 +4081,24 @@ To validate your cluster.conf against this schema, run:
         <optional>
           <attribute name="help" rha:description="Display help and exit" />
         </optional>
+        <optional>
+          <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" />
+        </optional>
+        <optional>
+          <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" />
+        </optional>
+        <optional>
+          <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
+        </optional>
+        <optional>
+          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
+        </optional>
       </group>
 
 
@@ -3521,6 +4170,24 @@ To validate your cluster.conf against this schema, run:
         <optional>
           <attribute name="separator" rha:description="Separator for CSV created by operation list" />
         </optional>
+        <optional>
+          <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" />
+        </optional>
+        <optional>
+          <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" />
+        </optional>
+        <optional>
+          <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" />
+        </optional>
+        <optional>
+          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
+        </optional>
+        <optional>
+          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
+        </optional>
       </group>
 
        <!-- end auto-generated device definitions -->
-- 
1.7.2.3