From mboxrd@z Thu Jan  1 00:00:00 1970
From: Fabio M. Di Nitto <fdinitto@redhat.com>
Date: Thu, 16 Dec 2010 20:30:32 +0100
Subject: [Cluster-devel] [PATCH] STABLE31 config: Update fence-agents
 section from fence-agents.git
In-Reply-To: <1292513050-15657-1-git-send-email-lhh@redhat.com>
References: <1292513050-15657-1-git-send-email-lhh@redhat.com>
Message-ID: <4D0A68D8.5070908@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

Looks OK to me. ACK

On 12/16/2010 04:24 PM, Lon Hohberger wrote:
> Signed-off-by: Lon Hohberger <lhh@redhat.com>
> ---
>  config/tools/xml/cluster.rng.in |  588 ++++++++++++++++++++++++---------------
>  1 files changed, 361 insertions(+), 227 deletions(-)
> 
> diff --git a/config/tools/xml/cluster.rng.in b/config/tools/xml/cluster.rng.in
> index 0562671..04906c9 100644
> --- a/config/tools/xml/cluster.rng.in
> +++ b/config/tools/xml/cluster.rng.in
> @@ -2642,7 +2642,8 @@ To validate your cluster.conf against this schema, run:
>         <!-- end non-generated device definitions -->
>  
>         <!-- begin auto-generated device definitions -->
> -      <group rha:fence_agent="fence_vmware">
> +      <!-- fence_alom -->
> +      <group>
>          <optional>
>            <attribute name="option"/> <!-- deprecated; for compatibility.  use "action" -->
>          </optional>
> @@ -2662,22 +2663,93 @@ 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" />
> +          <attribute name="secure" rha:description="SSH connection" />
>          </optional>
>          <optional>
> -          <attribute name="exec" rha:description="Command to execute" />
> +          <attribute name="identity_file" rha:description="Identity file for ssh" />
>          </optional>
>          <optional>
> -          <attribute name="vmware_type" rha:description="Type of VMware to connect" />
> +          <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="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="delay" rha:description="Wait X seconds before fencing is started" />
> +        </optional>
> +        <optional>
> +          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
> +        </optional>
> +      </group>
> +
> +
> +      <!-- fence_apc -->
> +      <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="secure" rha:description="SSH connection" />
>          </optional>
>          <optional>
> +          <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="vmware_datacenter" rha:description="Show only machines in specified datacenter" />
> +          <attribute name="switch" rha:description="Physical switch number on 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="ipport" rha:description="TCP port to use for connection with device" />
>          </optional>
>          <optional>
>            <attribute name="verbose" rha:description="Verbose mode" />
> @@ -2698,7 +2770,7 @@ To validate your cluster.conf against this schema, run:
>            <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 promprt after issuing command" />
> +          <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" />
> @@ -2707,15 +2779,16 @@ To validate your cluster.conf against this schema, run:
>            <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" />
> +          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
>          </optional>
>          <optional>
> -          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
> +          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
>          </optional>
>        </group>
>  
>  
> -      <group rha:fence_agent="fence_lpar">
> +      <!-- fence_apc_snmp -->
> +      <group>
>          <optional>
>            <attribute name="option"/> <!-- deprecated; for compatibility.  use "action" -->
>          </optional>
> @@ -2735,31 +2808,37 @@ To validate your cluster.conf against this schema, run:
>            <attribute name="passwd_script" rha:description="Script to retrieve password" />
>          </optional>
>          <optional>
> -          <attribute name="secure" rha:description="SSH connection" />
> +          <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" />
> +          <attribute name="snmp_version" rha:description="Specifies SNMP version to use (1,2c,3)" />
>          </optional>
>          <optional>
> -          <attribute name="partition" rha:description="Partition name" />
> +          <attribute name="community" rha:description="Set the community string" />
>          </optional>
>          <optional>
> -          <attribute name="managed" rha:description="Managed system name" />
> +          <attribute name="snmp_auth_prot" rha:description="Set authentication protocol (MD5|SHA)" />
>          </optional>
>          <optional>
> -          <attribute name="hmc_version" rha:description="Force HMC version to use (3 or 4)" />
> +          <attribute name="snmp_sec_level" rha:description="Set security level (noAuthNoPriv|authNoPriv|authPriv)" />
>          </optional>
>          <optional>
> -          <attribute name="cmd_prompt" rha:description="Force command prompt" />
> +          <attribute name="snmp_priv_prot" rha:description="Set privacy protocol (DES|AES)" />
>          </optional>
>          <optional>
> -          <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" />
> +          <attribute name="snmp_priv_passwd" rha:description="Set privacy protocol password" />
>          </optional>
>          <optional>
> -          <attribute name="inet6_only" rha:description="Forces agent to use IPv6 addresses only" />
> +          <attribute name="snmp_priv_passwd_script" rha:description="Script to run to retrieve privacy password" />
>          </optional>
>          <optional>
> -          <attribute name="ipport" rha:description="TCP port to use for connection with device" />
> +          <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" />
> @@ -2780,7 +2859,7 @@ To validate your cluster.conf against this schema, run:
>            <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 promprt after issuing command" />
> +          <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" />
> @@ -2789,15 +2868,17 @@ To validate your cluster.conf against this schema, run:
>            <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" />
> +          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
>          </optional>
>          <optional>
> -          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
> +          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
>          </optional>
>        </group>
>  
> +      <!-- No metadata for fence_baytech -->
>  
> -      <group rha:fence_agent="fence_bladecenter">
> +      <!-- fence_bladecenter -->
> +      <group>
>          <optional>
>            <attribute name="option"/> <!-- deprecated; for compatibility.  use "action" -->
>          </optional>
> @@ -2856,7 +2937,7 @@ To validate your cluster.conf against this schema, run:
>            <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 promprt after issuing command" />
> +          <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" />
> @@ -2868,15 +2949,18 @@ To validate your cluster.conf against this schema, run:
>            <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" />
> +          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
>          </optional>
>          <optional>
> -          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
> +          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
>          </optional>
>        </group>
>  
> +      <!-- No metadata for fence_brocade -->
> +      <!-- No metadata for fence_bullpap -->
>  
> -      <group rha:fence_agent="fence_intelmodular">
> +      <!-- fence_cisco_mds -->
> +      <group>
>          <optional>
>            <attribute name="option"/> <!-- deprecated; for compatibility.  use "action" -->
>          </optional>
> @@ -2947,7 +3031,7 @@ To validate your cluster.conf against this schema, run:
>            <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 promprt after issuing command" />
> +          <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" />
> @@ -2956,15 +3040,16 @@ To validate your cluster.conf against this schema, run:
>            <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" />
> +          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
>          </optional>
>          <optional>
> -          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
> +          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
>          </optional>
>        </group>
>  
>  
> -      <group rha:fence_agent="fence_ifmib">
> +      <!-- fence_cisco_ucs -->
> +      <group>
>          <optional>
>            <attribute name="option"/> <!-- deprecated; for compatibility.  use "action" -->
>          </optional>
> @@ -2984,31 +3069,89 @@ To validate your cluster.conf against this schema, run:
>            <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="snmp_version" rha:description="Specifies SNMP version to use (1,2c,3)" />
> +          <attribute name="verbose" rha:description="Verbose mode" />
>          </optional>
>          <optional>
> -          <attribute name="community" rha:description="Set the community string" />
> +          <attribute name="debug" rha:description="Write debug information to given file" />
>          </optional>
>          <optional>
> -          <attribute name="snmp_auth_prot" rha:description="Set authentication protocol (MD5|SHA)" />
> +          <attribute name="version" rha:description="Display version information and exit" />
>          </optional>
>          <optional>
> -          <attribute name="snmp_sec_level" rha:description="Set security level (noAuthNoPriv|authNoPriv|authPriv)" />
> +          <attribute name="help" rha:description="Display help and exit" />
>          </optional>
>          <optional>
> -          <attribute name="snmp_priv_prot" rha:description="Set privacy protocol (DES|AES)" />
> +          <attribute name="separator" rha:description="Separator for CSV created by operation list" />
>          </optional>
>          <optional>
> -          <attribute name="snmp_priv_passwd" rha:description="Set privacy protocol password" />
> +          <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" />
>          </optional>
>          <optional>
> -          <attribute name="snmp_priv_passwd_script" rha:description="Script to run to retrieve privacy password" />
> +          <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" />
>          </optional>
>          <optional>
> -          <attribute name="udpport" rha:description="UDP/TCP port to use for connection with device" />
> +          <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" />
> +        </optional>
> +        <optional>
> +          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
> +        </optional>
> +        <optional>
> +          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
> +        </optional>
> +      </group>
> +
> +      <!-- No metadata for fence_cpint -->
> +      <!-- No metadata for fence_drac -->
> +
> +      <!-- fence_drac5 -->
> +      <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="cmd_prompt" rha:description="Force command prompt" />
> +        </optional>
> +        <optional>
> +          <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>
> +          <attribute name="module_name" rha:description="DRAC/MC module name" />
>          </optional>
>          <optional>
>            <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" />
> @@ -3017,6 +3160,9 @@ To validate your cluster.conf against this schema, run:
>            <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="verbose" rha:description="Verbose mode" />
>          </optional>
>          <optional>
> @@ -3035,7 +3181,7 @@ To validate your cluster.conf against this schema, run:
>            <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 promprt after issuing command" />
> +          <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" />
> @@ -3044,15 +3190,17 @@ To validate your cluster.conf against this schema, run:
>            <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" />
> +          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
>          </optional>
>          <optional>
> -          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
> +          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
>          </optional>
>        </group>
>  
> +      <!-- No metadata for fence_egenera -->
>  
> -      <group rha:fence_agent="fence_eps">
> +      <!-- fence_eps -->
> +      <group>
>          <optional>
>            <attribute name="option"/> <!-- deprecated; for compatibility.  use "action" -->
>          </optional>
> @@ -3075,6 +3223,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>
> @@ -3090,15 +3241,16 @@ To validate your cluster.conf against this schema, run:
>            <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" />
> +          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
>          </optional>
>          <optional>
> -          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
> +          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
>          </optional>
>        </group>
>  
>  
> -      <group rha:fence_agent="fence_ldom">
> +      <!-- fence_ibmblade -->
> +      <group>
>          <optional>
>            <attribute name="option"/> <!-- deprecated; for compatibility.  use "action" -->
>          </optional>
> @@ -3118,25 +3270,37 @@ To validate your cluster.conf against this schema, run:
>            <attribute name="passwd_script" rha:description="Script to retrieve password" />
>          </optional>
>          <optional>
> -          <attribute name="secure" rha:description="SSH connection" />
> +          <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" />
> +          <attribute name="snmp_version" rha:description="Specifies SNMP version to use (1,2c,3)" />
>          </optional>
>          <optional>
> -          <attribute name="port" rha:description="Physical plug number or name of virtual machine" />
> +          <attribute name="community" rha:description="Set the community string" />
>          </optional>
>          <optional>
> -          <attribute name="cmd_prompt" rha:description="Force command prompt" />
> +          <attribute name="snmp_auth_prot" rha:description="Set authentication protocol (MD5|SHA)" />
>          </optional>
>          <optional>
> -          <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" />
> +          <attribute name="snmp_sec_level" rha:description="Set security level (noAuthNoPriv|authNoPriv|authPriv)" />
>          </optional>
>          <optional>
> -          <attribute name="inet6_only" rha:description="Forces agent to use IPv6 addresses only" />
> +          <attribute name="snmp_priv_prot" rha:description="Set privacy protocol (DES|AES)" />
>          </optional>
>          <optional>
> -          <attribute name="ipport" rha:description="TCP port to use for connection with device" />
> +          <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" />
> @@ -3157,7 +3321,7 @@ To validate your cluster.conf against this schema, run:
>            <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 promprt after issuing command" />
> +          <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" />
> @@ -3166,18 +3330,16 @@ To validate your cluster.conf against this schema, run:
>            <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" />
> +          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
>          </optional>
>          <optional>
> -          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
> +          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
>          </optional>
>        </group>
>  
> -      <!-- No metadata for fence_xcat -->
> -      <!-- No metadata for fence_rackswitch -->
> -      <!-- No metadata for fence_rsb -->
>  
> -      <group rha:fence_agent="fence_bladecenter_snmp">
> +      <!-- fence_ifmib -->
> +      <group>
>          <optional>
>            <attribute name="option"/> <!-- deprecated; for compatibility.  use "action" -->
>          </optional>
> @@ -3248,7 +3410,7 @@ To validate your cluster.conf against this schema, run:
>            <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 promprt after issuing command" />
> +          <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" />
> @@ -3257,18 +3419,16 @@ To validate your cluster.conf against this schema, run:
>            <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" />
> +          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
>          </optional>
>          <optional>
> -          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
> +          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
>          </optional>
>        </group>
>  
> -      <!-- No metadata for fence_cpint -->
> -      <!-- No metadata for fence_drac -->
> -      <!-- No metadata for fence_ipmilan -->
>  
> -      <group rha:fence_agent="fence_rsa">
> +      <!-- fence_ilo -->
> +      <group>
>          <optional>
>            <attribute name="option"/> <!-- deprecated; for compatibility.  use "action" -->
>          </optional>
> @@ -3288,13 +3448,16 @@ To validate your cluster.conf against this schema, run:
>            <attribute name="passwd_script" rha:description="Script to retrieve password" />
>          </optional>
>          <optional>
> -          <attribute name="cmd_prompt" rha:description="Force command prompt" />
> +          <attribute name="ssl" rha:description="SSL connection" />
>          </optional>
>          <optional>
> -          <attribute name="secure" rha:description="SSH connection" />
> +          <attribute name="ribcl" rha:description="Force ribcl version to use" />
>          </optional>
>          <optional>
> -          <attribute name="identity_file" rha:description="Identity file for ssh" />
> +          <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" />
> @@ -3315,7 +3478,7 @@ To validate your cluster.conf against this schema, run:
>            <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 promprt after issuing command" />
> +          <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" />
> @@ -3324,15 +3487,16 @@ To validate your cluster.conf against this schema, run:
>            <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" />
> +          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
>          </optional>
>          <optional>
> -          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
> +          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
>          </optional>
>        </group>
>  
>  
> -      <group rha:fence_agent="fence_virsh">
> +      <!-- fence_ilo_mp -->
> +      <group>
>          <optional>
>            <attribute name="option"/> <!-- deprecated; for compatibility.  use "action" -->
>          </optional>
> @@ -3358,16 +3522,16 @@ To validate your cluster.conf against this schema, run:
>            <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" />
> +          <attribute name="cmd_prompt" rha:description="Force command prompt" />
>          </optional>
>          <optional>
> -          <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" />
> +          <attribute name="ipport" rha:description="TCP port to use for connection with device" />
>          </optional>
>          <optional>
> -          <attribute name="inet6_only" rha:description="Forces agent to use IPv6 addresses only" />
> +          <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" />
>          </optional>
>          <optional>
> -          <attribute name="ipport" rha:description="TCP port to use for connection with device" />
> +          <attribute name="inet6_only" rha:description="Forces agent to use IPv6 addresses only" />
>          </optional>
>          <optional>
>            <attribute name="verbose" rha:description="Verbose mode" />
> @@ -3388,7 +3552,7 @@ To validate your cluster.conf against this schema, run:
>            <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 promprt after issuing command" />
> +          <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" />
> @@ -3397,17 +3561,16 @@ To validate your cluster.conf against this schema, run:
>            <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" />
> +          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
>          </optional>
>          <optional>
> -          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
> +          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
>          </optional>
>        </group>
>  
> -      <!-- No metadata for fence_mcdata -->
> -      <!-- No metadata for fence_bullpap -->
>  
> -      <group rha:fence_agent="fence_wti">
> +      <!-- fence_intelmodular -->
> +      <group>
>          <optional>
>            <attribute name="option"/> <!-- deprecated; for compatibility.  use "action" -->
>          </optional>
> @@ -3427,25 +3590,37 @@ To validate your cluster.conf against this schema, run:
>            <attribute name="passwd_script" rha:description="Script to retrieve password" />
>          </optional>
>          <optional>
> -          <attribute name="cmd_prompt" rha:description="Force command prompt" />
> +          <attribute name="port" rha:description="Physical plug number or name of virtual machine" />
>          </optional>
>          <optional>
> -          <attribute name="secure" rha:description="SSH connection" />
> +          <attribute name="snmp_version" rha:description="Specifies SNMP version to use (1,2c,3)" />
>          </optional>
>          <optional>
> -          <attribute name="identity_file" rha:description="Identity file for ssh" />
> +          <attribute name="community" rha:description="Set the community string" />
>          </optional>
>          <optional>
> -          <attribute name="port" rha:description="Physical plug number or name of virtual machine" />
> +          <attribute name="snmp_auth_prot" rha:description="Set authentication protocol (MD5|SHA)" />
>          </optional>
>          <optional>
> -          <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" />
> +          <attribute name="snmp_sec_level" rha:description="Set security level (noAuthNoPriv|authNoPriv|authPriv)" />
>          </optional>
>          <optional>
> -          <attribute name="inet6_only" rha:description="Forces agent to use IPv6 addresses only" />
> +          <attribute name="snmp_priv_prot" rha:description="Set privacy protocol (DES|AES)" />
>          </optional>
>          <optional>
> -          <attribute name="ipport" rha:description="TCP port to use for connection with device" />
> +          <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" />
> @@ -3466,7 +3641,7 @@ To validate your cluster.conf against this schema, run:
>            <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 promprt after issuing command" />
> +          <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" />
> @@ -3475,16 +3650,16 @@ To validate your cluster.conf against this schema, run:
>            <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" />
> +          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
>          </optional>
>          <optional>
> -          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
> +          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
>          </optional>
>        </group>
>  
> -      <!-- No metadata for fence_zvm -->
>  
> -      <group rha:fence_agent="fence_drac5">
> +      <!-- fence_ldom -->
> +      <group>
>          <optional>
>            <attribute name="option"/> <!-- deprecated; for compatibility.  use "action" -->
>          </optional>
> @@ -3504,19 +3679,16 @@ To validate your cluster.conf against this schema, run:
>            <attribute name="passwd_script" rha:description="Script to retrieve password" />
>          </optional>
>          <optional>
> -          <attribute name="cmd_prompt" rha:description="Force command prompt" />
> -        </optional>
> -        <optional>
>            <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" />
> +          <attribute name="port" rha:description="Physical plug number or name of virtual machine" />
>          </optional>
>          <optional>
> -          <attribute name="module_name" rha:description="DRAC/MC module name" />
> +          <attribute name="cmd_prompt" rha:description="Force command prompt" />
>          </optional>
>          <optional>
>            <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" />
> @@ -3546,7 +3718,7 @@ To validate your cluster.conf against this schema, run:
>            <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 promprt after issuing command" />
> +          <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" />
> @@ -3555,43 +3727,16 @@ To validate your cluster.conf against this schema, run:
>            <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 -->
> -
> -      <group rha:fence_agent="fence_scsi">
> -        <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" />
> +          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
>          </optional>
>        </group>
>  
> -      <!-- No metadata for fence_brocade -->
>  
> -      <group rha:fence_agent="fence_ilo_mp">
> +      <!-- fence_lpar -->
> +      <group>
>          <optional>
>            <attribute name="option"/> <!-- deprecated; for compatibility.  use "action" -->
>          </optional>
> @@ -3617,10 +3762,16 @@ To validate your cluster.conf against this schema, run:
>            <attribute name="identity_file" rha:description="Identity file for ssh" />
>          </optional>
>          <optional>
> -          <attribute name="cmd_prompt" rha:description="Force command prompt" />
> +          <attribute name="partition" rha:description="Partition name" />
>          </optional>
>          <optional>
> -          <attribute name="ipport" rha:description="TCP port to use for connection with device" />
> +          <attribute name="managed" rha:description="Managed system name" />
> +        </optional>
> +        <optional>
> +          <attribute name="hmc_version" rha:description="Force HMC version to use (3 or 4)" />
> +        </optional>
> +        <optional>
> +          <attribute name="cmd_prompt" rha:description="Force command prompt" />
>          </optional>
>          <optional>
>            <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" />
> @@ -3629,6 +3780,9 @@ To validate your cluster.conf against this schema, run:
>            <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="verbose" rha:description="Verbose mode" />
>          </optional>
>          <optional>
> @@ -3647,7 +3801,7 @@ To validate your cluster.conf against this schema, run:
>            <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 promprt after issuing command" />
> +          <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" />
> @@ -3656,15 +3810,19 @@ To validate your cluster.conf against this schema, run:
>            <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" />
> +          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
>          </optional>
>          <optional>
> -          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
> +          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
>          </optional>
>        </group>
>  
> +      <!-- No metadata for fence_ack_manual -->
> +      <!-- No metadata for fence_mcdata -->
> +      <!-- No metadata for fence_rackswitch -->
>  
> -      <group rha:fence_agent="fence_apc">
> +      <!-- fence_rhevm -->
> +      <group>
>          <optional>
>            <attribute name="option"/> <!-- deprecated; for compatibility.  use "action" -->
>          </optional>
> @@ -3684,16 +3842,7 @@ To validate your cluster.conf against this schema, run:
>            <attribute name="passwd_script" rha:description="Script to retrieve password" />
>          </optional>
>          <optional>
> -          <attribute name="secure" rha:description="SSH connection" />
> -        </optional>
> -        <optional>
> -          <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" />
> +          <attribute name="ssl" rha:description="SSL connection" />
>          </optional>
>          <optional>
>            <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" />
> @@ -3705,6 +3854,9 @@ To validate your cluster.conf against this schema, run:
>            <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>
> @@ -3720,27 +3872,25 @@ To validate your cluster.conf against this schema, run:
>            <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" />
> +          <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" />
>          </optional>
>          <optional>
> -          <attribute name="shell_timeout" rha:description="Wait X seconds for cmd promprt after issuing command" />
> +          <attribute name="power_timeout" rha:description="Test X seconds for status change after ON/OFF" />
>          </optional>
>          <optional>
> -          <attribute name="login_timeout" rha:description="Wait X seconds for cmd prompt after login" />
> +          <attribute name="shell_timeout" rha:description="Wait X seconds for cmd prompt after issuing command" />
>          </optional>
>          <optional>
> -          <attribute name="power_wait" rha:description="Wait X seconds after issuing ON/OFF" />
> +          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
>          </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>
>  
>  
> -      <group rha:fence_agent="fence_alom">
> +      <!-- fence_rsa -->
> +      <group>
>          <optional>
>            <attribute name="option"/> <!-- deprecated; for compatibility.  use "action" -->
>          </optional>
> @@ -3760,16 +3910,13 @@ To validate your cluster.conf against this schema, run:
>            <attribute name="passwd_script" rha:description="Script to retrieve password" />
>          </optional>
>          <optional>
> -          <attribute name="secure" rha:description="SSH connection" />
> -        </optional>
> -        <optional>
> -          <attribute name="identity_file" rha:description="Identity file for ssh" />
> +          <attribute name="cmd_prompt" rha:description="Force command prompt" />
>          </optional>
>          <optional>
> -          <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" />
> +          <attribute name="secure" rha:description="SSH connection" />
>          </optional>
>          <optional>
> -          <attribute name="inet6_only" rha:description="Forces agent to use IPv6 addresses only" />
> +          <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" />
> @@ -3790,7 +3937,7 @@ To validate your cluster.conf against this schema, run:
>            <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 promprt after issuing command" />
> +          <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" />
> @@ -3799,16 +3946,17 @@ To validate your cluster.conf against this schema, run:
>            <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" />
> +          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
>          </optional>
>          <optional>
> -          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
> +          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
>          </optional>
>        </group>
>  
> -      <!-- No metadata for fence_ibmblade -->
> +      <!-- No metadata for fence_rsb -->
>  
> -      <group rha:fence_agent="fence_sanbox2">
> +      <!-- fence_sanbox2 -->
> +      <group>
>          <optional>
>            <attribute name="option"/> <!-- deprecated; for compatibility.  use "action" -->
>          </optional>
> @@ -3855,7 +4003,7 @@ To validate your cluster.conf against this schema, run:
>            <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 promprt after issuing command" />
> +          <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" />
> @@ -3864,16 +4012,17 @@ To validate your cluster.conf against this schema, run:
>            <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" />
> +          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
>          </optional>
>          <optional>
> -          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
> +          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
>          </optional>
>        </group>
>  
> -      <!-- No metadata for fence_egenera -->
> +      <!-- No metadata for fence_scsi -->
>  
> -      <group rha:fence_agent="fence_apc_snmp">
> +      <!-- fence_virsh -->
> +      <group>
>          <optional>
>            <attribute name="option"/> <!-- deprecated; for compatibility.  use "action" -->
>          </optional>
> @@ -3893,31 +4042,13 @@ 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)" />
> -        </optional>
> -        <optional>
> -          <attribute name="community" rha:description="Set the community string" />
> -        </optional>
> -        <optional>
> -          <attribute name="snmp_auth_prot" rha:description="Set authentication protocol (MD5|SHA)" />
> -        </optional>
> -        <optional>
> -          <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" />
> +          <attribute name="secure" rha:description="SSH connection" />
>          </optional>
>          <optional>
> -          <attribute name="snmp_priv_passwd_script" rha:description="Script to run to retrieve privacy password" />
> +          <attribute name="identity_file" rha:description="Identity file for ssh" />
>          </optional>
>          <optional>
> -          <attribute name="udpport" rha:description="UDP/TCP port to use for connection with device" />
> +          <attribute name="port" rha:description="Physical plug number or name of virtual machine" />
>          </optional>
>          <optional>
>            <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" />
> @@ -3926,6 +4057,9 @@ To validate your cluster.conf against this schema, run:
>            <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="verbose" rha:description="Verbose mode" />
>          </optional>
>          <optional>
> @@ -3944,7 +4078,7 @@ To validate your cluster.conf against this schema, run:
>            <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 promprt after issuing command" />
> +          <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" />
> @@ -3953,15 +4087,17 @@ To validate your cluster.conf against this schema, run:
>            <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" />
> +          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
>          </optional>
>          <optional>
> -          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
> +          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
>          </optional>
>        </group>
>  
> +      <!-- No metadata for fence_vixel -->
>  
> -      <group rha:fence_agent="fence_ilo">
> +      <!-- fence_vmware -->
> +      <group>
>          <optional>
>            <attribute name="option"/> <!-- deprecated; for compatibility.  use "action" -->
>          </optional>
> @@ -3981,19 +4117,22 @@ To validate your cluster.conf against this schema, run:
>            <attribute name="passwd_script" rha:description="Script to retrieve password" />
>          </optional>
>          <optional>
> -          <attribute name="ssl" rha:description="SSL connection" />
> +          <attribute name="port" rha:description="Physical plug number or name of virtual machine" />
>          </optional>
>          <optional>
> -          <attribute name="ribcl" rha:description="Force ribcl version to use" />
> +          <attribute name="exec" rha:description="Command to execute" />
>          </optional>
>          <optional>
> -          <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" />
> +          <attribute name="vmware_type" rha:description="Type of VMware to connect" />
>          </optional>
>          <optional>
> -          <attribute name="inet6_only" rha:description="Forces agent to use IPv6 addresses only" />
> +          <attribute name="secure" rha:description="SSH connection" />
>          </optional>
>          <optional>
> -          <attribute name="ipport" rha:description="TCP port to use for connection with device" />
> +          <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>
>            <attribute name="verbose" rha:description="Verbose mode" />
> @@ -4008,10 +4147,13 @@ To validate your cluster.conf against this schema, run:
>            <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 promprt after issuing command" />
> +          <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" />
> @@ -4020,15 +4162,17 @@ To validate your cluster.conf against this schema, run:
>            <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" />
> +          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
>          </optional>
>          <optional>
> -          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
> +          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
>          </optional>
>        </group>
>  
> +      <!-- No metadata for fence_vmware_helper -->
>  
> -      <group rha:fence_agent="fence_cisco_mds">
> +      <!-- fence_wti -->
> +      <group>
>          <optional>
>            <attribute name="option"/> <!-- deprecated; for compatibility.  use "action" -->
>          </optional>
> @@ -4048,31 +4192,16 @@ 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)" />
> -        </optional>
> -        <optional>
> -          <attribute name="community" rha:description="Set the community string" />
> -        </optional>
> -        <optional>
> -          <attribute name="snmp_auth_prot" rha:description="Set authentication protocol (MD5|SHA)" />
> -        </optional>
> -        <optional>
> -          <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)" />
> +          <attribute name="cmd_prompt" rha:description="Force command prompt" />
>          </optional>
>          <optional>
> -          <attribute name="snmp_priv_passwd" rha:description="Set privacy protocol password" />
> +          <attribute name="secure" rha:description="SSH connection" />
>          </optional>
>          <optional>
> -          <attribute name="snmp_priv_passwd_script" rha:description="Script to run to retrieve privacy password" />
> +          <attribute name="identity_file" rha:description="Identity file for ssh" />
>          </optional>
>          <optional>
> -          <attribute name="udpport" rha:description="UDP/TCP port to use for connection with device" />
> +          <attribute name="port" rha:description="Physical plug number or name of virtual machine" />
>          </optional>
>          <optional>
>            <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" />
> @@ -4081,6 +4210,9 @@ To validate your cluster.conf against this schema, run:
>            <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="verbose" rha:description="Verbose mode" />
>          </optional>
>          <optional>
> @@ -4099,7 +4231,7 @@ To validate your cluster.conf against this schema, run:
>            <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 promprt after issuing command" />
> +          <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" />
> @@ -4108,13 +4240,15 @@ To validate your cluster.conf against this schema, run:
>            <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" />
> +          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
>          </optional>
>          <optional>
> -          <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
> +          <attribute name="retry_on" rha:description="Count of attempts to retry power on" />
>          </optional>
>        </group>
>  
> +      <!-- No metadata for fence_xcat -->
> +      <!-- No metadata for fence_zvm -->
>         <!-- end auto-generated device definitions -->
>  
>         <group>