cluster: RHEL57 - resource-agents: Apache resource with spaces in name fails to start
by Marek Grác
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 6d0b3a728aa478d73621fa003be63806d3623b26
Parent: dbbb859091a700db2fc4dcd4e4df4a0dfdaa84b1
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Mon Feb 7 14:12:47 2011 +0100
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Mon Feb 7 14:51:57 2011 +0100
resource-agents: Apache resource with spaces in name fails to start
Resolve: rhbz#632704
---
rgmanager/src/resources/utils/config-utils.sh | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/rgmanager/src/resources/utils/config-utils.sh b/rgmanager/src/resources/utils/config-utils.sh
index 60fc6e0..5646fa8 100644
--- a/rgmanager/src/resources/utils/config-utils.sh
+++ b/rgmanager/src/resources/utils/config-utils.sh
@@ -27,7 +27,7 @@ declare -a ip_keys
generate_configTemplate()
{
- cat > $1 << EOT
+ cat > "$1" << EOT
#
# "$1" was created from the "$2"
#
@@ -53,8 +53,8 @@ sha1_verify()
ocf_log debug "Checking: SHA1 checksum of config file $oldFile"
- sha1_new=`cat $oldFile | grep -v "# rgmanager-sha1" | sha1sum | sed 's/^\([a-z0-9]\+\) .*$/\1/'`
- sha1_old=`tail -n 1 $oldFile | sed 's/^# rgmanager-sha1 \(.*\)$/\1/' | sed 's/^\([a-z0-9]\+\) .*$/\1/'`
+ sha1_new=`cat "$oldFile" | grep -v "# rgmanager-sha1" | sha1sum | sed 's/^\([a-z0-9]\+\) .*$/\1/'`
+ sha1_old=`tail -n 1 "$oldFile" | sed 's/^# rgmanager-sha1 \(.*\)$/\1/' | sed 's/^\([a-z0-9]\+\) .*$/\1/'`
if [ $sha1_new = $sha1_old ]; then
ocf_log debug "Checking: SHA1 checksum > succeed"
@@ -304,4 +304,4 @@ check_pid_file() {
fi
return 1;
-}
\ No newline at end of file
+}
13 years, 3 months
resource-agents: master - resource-agents: Remove netmask from IP address when creating list of them
by Marek Grác
Gitweb: http://git.fedorahosted.org/git/resource-agents.git?p=resource-agents.git...
Commit: 49ef8ffe48a2fc6a7e4c132bab87b11a76dd8f9e
Parent: 4ae988fa61afad242a870571622f4ab2aafadc31
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Mon Feb 7 14:14:39 2011 +0100
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Mon Feb 7 14:14:39 2011 +0100
resource-agents: Remove netmask from IP address when creating list of them
IP address were copied directly to configuration of various resource agents.
Resolves: rhbz#667217
---
rgmanager/src/resources/utils/config-utils.sh.in | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/rgmanager/src/resources/utils/config-utils.sh.in b/rgmanager/src/resources/utils/config-utils.sh.in
index 2d461bb..dd43d41 100644
--- a/rgmanager/src/resources/utils/config-utils.sh.in
+++ b/rgmanager/src/resources/utils/config-utils.sh.in
@@ -145,7 +145,9 @@ build_ip_list()
break
fi
- ipaddrs="$ipaddrs $ipaddr"
+ # remove netmask
+ iponly=`echo $ipaddr | sed 's/\/.*//'`
+ ipaddrs="$ipaddrs $iponly"
((x++))
done
13 years, 3 months
resource-agents: master - resource-agents: Apache resource with spaces in name fails to start
by Marek Grác
Gitweb: http://git.fedorahosted.org/git/resource-agents.git?p=resource-agents.git...
Commit: 4ae988fa61afad242a870571622f4ab2aafadc31
Parent: a23793faa3c7718177cbbda77363d5fd3765415d
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Mon Feb 7 14:12:47 2011 +0100
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Mon Feb 7 14:12:47 2011 +0100
resource-agents: Apache resource with spaces in name fails to start
Resolve: rhbz#667222
---
rgmanager/src/resources/utils/config-utils.sh.in | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/rgmanager/src/resources/utils/config-utils.sh.in b/rgmanager/src/resources/utils/config-utils.sh.in
index e3a44d0..2d461bb 100644
--- a/rgmanager/src/resources/utils/config-utils.sh.in
+++ b/rgmanager/src/resources/utils/config-utils.sh.in
@@ -8,7 +8,7 @@ declare -a ip_keys
generate_configTemplate()
{
- cat > $1 << EOT
+ cat > "$1" << EOT
#
# "$1" was created from the "$2"
#
@@ -34,8 +34,8 @@ sha1_verify()
ocf_log debug "Checking: SHA1 checksum of config file $oldFile"
- sha1_new=`cat $oldFile | grep -v "# rgmanager-sha1" | sha1sum | sed 's/^\([a-z0-9]\+\) .*$/\1/'`
- sha1_old=`tail -n 1 $oldFile | sed 's/^# rgmanager-sha1 \(.*\)$/\1/' | sed 's/^\([a-z0-9]\+\) .*$/\1/'`
+ sha1_new=`cat "$oldFile" | grep -v "# rgmanager-sha1" | sha1sum | sed 's/^\([a-z0-9]\+\) .*$/\1/'`
+ sha1_old=`tail -n 1 "$oldFile" | sed 's/^# rgmanager-sha1 \(.*\)$/\1/' | sed 's/^\([a-z0-9]\+\) .*$/\1/'`
if [ "$sha1_new" = "$sha1_old" ]; then
ocf_log debug "Checking: SHA1 checksum > succeed"
13 years, 3 months
cluster: RHEL6 - qdiskd: Fix auto-vote calculation loop
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 8fd8d3f3c52b9efc09d911bd8fdcab3e8742e9cb
Parent: b4dc284f463237afb47c88abbfe48a6209ce9a51
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Fri Feb 4 11:19:50 2011 -0500
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Fri Feb 4 11:27:43 2011 -0500
qdiskd: Fix auto-vote calculation loop
Resolves: rhbz#663433
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
cman/qdisk/disk.c | 1 +
cman/qdisk/main.c | 31 ++++++++++++++++---------------
2 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/cman/qdisk/disk.c b/cman/qdisk/disk.c
index 1f646ce..9884ea7 100644
--- a/cman/qdisk/disk.c
+++ b/cman/qdisk/disk.c
@@ -24,6 +24,7 @@
#include <platform.h>
#include <unistd.h>
#include <time.h>
+#include <linux/types.h>
#include <linux/fs.h>
#include <liblogthread.h>
#include <zlib.h>
diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c
index ebdb018..9262af2 100644
--- a/cman/qdisk/main.c
+++ b/cman/qdisk/main.c
@@ -1377,32 +1377,33 @@ auto_qdisk_votes(int desc)
{
int ret = 1;
char buf[PATH_MAX];
- char *name;
+ char *v = NULL, *name = NULL;
while (1) {
int votes=0;
+ name = NULL;
+ snprintf(buf, sizeof(buf)-1,
+ "/cluster/clusternodes/clusternode[%d]/@name", ret);
+ if (ccs_get(desc, buf, &name) != 0)
+ break;
+
snprintf(buf, sizeof(buf)-1,
"/cluster/clusternodes/clusternode[%d]/@votes", ret);
- name = NULL;
- if (ccs_get(desc, buf, &name) == 0)
- votes = atoi(name);
- else
+ if (ccs_get(desc, buf, &v) == 0) {
+ votes = atoi(v);
+ free(v);
+ v = NULL;
+ } else {
votes = 1;
+ }
if (votes != 1) {
- free(name);
- snprintf(buf, sizeof(buf)-1,
- "/cluster/clusternodes/clusternode[%d]/@name",
- ret);
-
- if (ccs_get(desc, buf, &name) == 0) {
- logt_print(LOG_ERR, "%s's vote count is %d\n",
- name, votes);
- free(name);
- }
+ logt_print(LOG_ERR, "%s's vote count is %d\n",
+ name, votes);
+ free(name);
logt_print(LOG_ERR, "Set all node vote counts to 1 "
"or specify qdiskd's votes\n");
13 years, 3 months
cluster: STABLE31 - qdiskd: Fix auto-vote calculation loop
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: cbf98a5623e7177d497092f7a7b0e170b8b3177e
Parent: e2c5e231eb9d6732235a073e2556993891b79e3f
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Fri Feb 4 11:19:50 2011 -0500
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Fri Feb 4 11:23:39 2011 -0500
qdiskd: Fix auto-vote calculation loop
Resolves: rhbz#663433
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
cman/qdisk/disk.c | 1 +
cman/qdisk/main.c | 31 ++++++++++++++++---------------
2 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/cman/qdisk/disk.c b/cman/qdisk/disk.c
index 1f646ce..9884ea7 100644
--- a/cman/qdisk/disk.c
+++ b/cman/qdisk/disk.c
@@ -24,6 +24,7 @@
#include <platform.h>
#include <unistd.h>
#include <time.h>
+#include <linux/types.h>
#include <linux/fs.h>
#include <liblogthread.h>
#include <zlib.h>
diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c
index ebdb018..9262af2 100644
--- a/cman/qdisk/main.c
+++ b/cman/qdisk/main.c
@@ -1377,32 +1377,33 @@ auto_qdisk_votes(int desc)
{
int ret = 1;
char buf[PATH_MAX];
- char *name;
+ char *v = NULL, *name = NULL;
while (1) {
int votes=0;
+ name = NULL;
+ snprintf(buf, sizeof(buf)-1,
+ "/cluster/clusternodes/clusternode[%d]/@name", ret);
+ if (ccs_get(desc, buf, &name) != 0)
+ break;
+
snprintf(buf, sizeof(buf)-1,
"/cluster/clusternodes/clusternode[%d]/@votes", ret);
- name = NULL;
- if (ccs_get(desc, buf, &name) == 0)
- votes = atoi(name);
- else
+ if (ccs_get(desc, buf, &v) == 0) {
+ votes = atoi(v);
+ free(v);
+ v = NULL;
+ } else {
votes = 1;
+ }
if (votes != 1) {
- free(name);
- snprintf(buf, sizeof(buf)-1,
- "/cluster/clusternodes/clusternode[%d]/@name",
- ret);
-
- if (ccs_get(desc, buf, &name) == 0) {
- logt_print(LOG_ERR, "%s's vote count is %d\n",
- name, votes);
- free(name);
- }
+ logt_print(LOG_ERR, "%s's vote count is %d\n",
+ name, votes);
+ free(name);
logt_print(LOG_ERR, "Set all node vote counts to 1 "
"or specify qdiskd's votes\n");
13 years, 3 months
cluster: RHEL6 - doc: Update cluster_conf.html to match schema
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: b4dc284f463237afb47c88abbfe48a6209ce9a51
Parent: a6d691f0925effe140e5970522eb1c560da9802e
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Thu Feb 3 16:58:36 2011 -0500
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Thu Feb 3 17:46:03 2011 -0500
doc: Update cluster_conf.html to match schema
Resolves: rhbz#618705
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
doc/cluster_conf.html | 143 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 119 insertions(+), 24 deletions(-)
diff --git a/doc/cluster_conf.html b/doc/cluster_conf.html
index 17d3f37..5bfafac 100644
--- a/doc/cluster_conf.html
+++ b/doc/cluster_conf.html
@@ -100,10 +100,6 @@
<<a href="#tag_postgres-8">postgres-8</a> ...><br/>
<a href="#ref_CHILDREN">CHILDREN</a><br/>
<<a href="#tag_postgres-8">/postgres-8</a>><br/>
-<br/><a name="ref_TOMCAT-5"/>TOMCAT-5 definition<br/>
- <<a href="#tag_tomcat-5">tomcat-5</a> ...><br/>
- <a href="#ref_CHILDREN">CHILDREN</a><br/>
- <<a href="#tag_tomcat-5">/tomcat-5</a>><br/>
<br/><a name="ref_TOMCAT-6"/>TOMCAT-6 definition<br/>
<<a href="#tag_tomcat-6">tomcat-6</a> ...><br/>
<a href="#ref_CHILDREN">CHILDREN</a><br/>
@@ -136,6 +132,14 @@
<<a href="#tag_nfsserver">nfsserver</a> ...><br/>
<a href="#ref_CHILDREN">CHILDREN</a><br/>
<<a href="#tag_nfsserver">/nfsserver</a>><br/>
+<br/><a name="ref_ORAINSTANCE"/>ORAINSTANCE definition<br/>
+ <<a href="#tag_orainstance">orainstance</a> ...><br/>
+ <a href="#ref_CHILDREN">CHILDREN</a><br/>
+ <<a href="#tag_orainstance">/orainstance</a>><br/>
+<br/><a name="ref_ORALISTENER"/>ORALISTENER definition<br/>
+ <<a href="#tag_oralistener">oralistener</a> ...><br/>
+ <a href="#ref_CHILDREN">CHILDREN</a><br/>
+ <<a href="#tag_oralistener">/oralistener</a>><br/>
<br/><a name="ref_FS"/>FS definition<br/>
<<a href="#tag_fs">fs</a> ...><br/>
<a href="#ref_CHILDREN">CHILDREN</a><br/>
@@ -157,7 +161,6 @@
<a href="#ref_SAMBA">SAMBA</a><br/>
<a href="#ref_MYSQL">MYSQL</a><br/>
<a href="#ref_POSTGRES-8">POSTGRES-8</a><br/>
- <a href="#ref_TOMCAT-5">TOMCAT-5</a><br/>
<a href="#ref_TOMCAT-6">TOMCAT-6</a><br/>
<a href="#ref_LVM">LVM</a><br/>
<a href="#ref_VM">VM</a><br/>
@@ -166,6 +169,8 @@
<a href="#ref_NAMED">NAMED</a><br/>
<a href="#ref_ASEHAAGENT">ASEHAAGENT</a><br/>
<a href="#ref_NFSSERVER">NFSSERVER</a><br/>
+ <a href="#ref_ORAINSTANCE">ORAINSTANCE</a><br/>
+ <a href="#ref_ORALISTENER">ORALISTENER</a><br/>
<a href="#ref_FS">FS</a><br/>
<a href="#ref_ORACLEDB">ORACLEDB</a><br/>
<a href="#ref_RESOURCEACTION">RESOURCEACTION</a><br/>
@@ -231,6 +236,8 @@
<tr valign="top"><td><a href="#tag_nfsserver"><b>nfsserver</b></a></td><td>This defines an NFS server resource.</td></tr>
<tr valign="top"><td><a href="#tag_openldap"><b>openldap</b></a></td><td>Defines an Open LDAP server</td></tr>
<tr valign="top"><td><a href="#tag_oracledb"><b>oracledb</b></a></td><td>Oracle 10g Failover Instance</td></tr>
+<tr valign="top"><td><a href="#tag_orainstance"><b>orainstance</b></a></td><td>Oracle 10g Failover Instance</td></tr>
+<tr valign="top"><td><a href="#tag_oralistener"><b>oralistener</b></a></td><td>Oracle 10g Listener Instance</td></tr>
<tr valign="top"><td><a href="#tag_postgres-8"><b>postgres-8</b></a></td><td>Defines a PostgreSQL server</td></tr>
<tr valign="top"><td><a href="#tag_quorumd"><b>quorumd</b></a></td><td>This element and its attributes define parameters for the quorum disk daemon, quorumd. qdisk(5).</td></tr>
<tr valign="top"><td><a href="#tag_resources"><b>resources</b></a></td><td>Defines global resources which may be referenced in services. You may redefine actions for resources here, but child resource definitions are ignored in this section.</td></tr>
@@ -240,7 +247,6 @@
<tr valign="top"><td><a href="#tag_SAPInstance"><b>SAPInstance</b></a></td><td>SAP instance resource agent</td></tr>
<tr valign="top"><td><a href="#tag_script"><b>script</b></a></td><td>LSB-compliant init script as a clustered resource.</td></tr>
<tr valign="top"><td><a href="#tag_service"><b>service</b></a></td><td>Defines a service (resource group).</td></tr>
-<tr valign="top"><td><a href="#tag_tomcat-5"><b>tomcat-5</b></a></td><td>Defines a Tomcat server</td></tr>
<tr valign="top"><td><a href="#tag_tomcat-6"><b>tomcat-6</b></a></td><td>Defines a Tomcat server</td></tr>
<tr valign="top"><td><a href="#tag_totem"><b>totem</b></a></td><td>OpenAIS msg transport protocol</td></tr>
<tr valign="top"><td><a href="#tag_unfence"><b>unfence</b></a></td><td>Contains devices for unfencing the node. fence_node(8)</td></tr>
@@ -281,6 +287,8 @@ Defines an Apache web server<br/>
<tr><td><b>__failure_expire_time</b></td><td>Amount of time before a failure is forgotten.</td></tr>
<tr><td><b>__independent_subtree</b></td><td>Treat this and all children as an independent subtree.</td></tr>
<tr><td><b>__max_failures</b></td><td>Maximum number of failures before returning a failure to a status check.</td></tr>
+ <tr><td><b>__max_restarts</b></td><td>Maximum number restarts for an independent subtree before giving up.</td></tr>
+ <tr><td><b>__restart_expire_time</b></td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr>
</table><br/>
Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
<h3><a name="tag_ASEHAagent"/>ASEHAagent</h3>
@@ -303,6 +311,8 @@ Sybase ASE Failover Instance<br/>
<tr><td><b>__failure_expire_time</b></td><td>Amount of time before a failure is forgotten.</td></tr>
<tr><td><b>__independent_subtree</b></td><td>Treat this and all children as an independent subtree.</td></tr>
<tr><td><b>__max_failures</b></td><td>Maximum number of failures before returning a failure to a status check.</td></tr>
+ <tr><td><b>__max_restarts</b></td><td>Maximum number restarts for an independent subtree before giving up.</td></tr>
+ <tr><td><b>__restart_expire_time</b></td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr>
</table><br/>
Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
<h3><a name="tag_cluster"/>cluster</h3>
@@ -331,6 +341,8 @@ Defines a cluster file system mount.<br/>
<tr><td><b>__failure_expire_time</b></td><td>Amount of time before a failure is forgotten.</td></tr>
<tr><td><b>__independent_subtree</b></td><td>Treat this and all children as an independent subtree.</td></tr>
<tr><td><b>__max_failures</b></td><td>Maximum number of failures before returning a failure to a status check.</td></tr>
+ <tr><td><b>__max_restarts</b></td><td>Maximum number restarts for an independent subtree before giving up.</td></tr>
+ <tr><td><b>__restart_expire_time</b></td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr>
</table><br/>
Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
<h3><a name="tag_clusternode"/>clusternode</h3>
@@ -371,6 +383,7 @@ The cman element contains attributes that define the following cluster-wide para
<tr><td><b>port</b></td><td> </td></tr>
<tr><td><b>quorum_dev_poll</b></td><td>The amount of time after a qdisk poll, in milliseconds, before a quorum disk is considered dead. The quorum disk daemon, qdisk, periodically sends hello messages to cman and ais, indicating that qdisk is present. If qdisk takes more time to send a hello message to cman and ais than by quorum_dev_poll, then cman declares qdisk dead and prints a message indicating that connection to the quorum device has been lost.</td></tr>
<tr><td><b>shutdown_timeout</b></td><td>Timeout period, in milliseconds, to allow a service to respond during a shutdown.</td></tr>
+ <tr><td><b>transport</b></td><td>Specifies transport mechanism to use. Available values are udp (multicast default), udpb (broadcast), udpu (unicast) and rdma (Infiniband). corosync.conf(5)</td></tr>
<tr><td><b>two_node</b></td><td>The two_node attribute allows you to configure a cluster with only two nodes. Ordinarily, the loss of quorum after one of two nodes fails prevents the remaining node from continuing (if both nodes have one vote.) To enable a two-node cluster, set the two_node value equal to 1. If the two_node value is enabled, the expected_votes value must be set to 1.</td></tr>
<tr><td><b>upgrading</b></td><td>Set this if you are performing a rolling upgrade of the cluster between major releases.</td></tr>
</table><br/>
@@ -389,13 +402,16 @@ Defines the properties of a device used for fencing or unfencing a node. fenced(
<tr><td><b>community</b></td><td>Set the community string</td></tr>
<tr><td><b>cserver</b></td><td>The hostname (and optionally the username in the form of username@hostname) assigned to the device. Refer to the fence_egenera(8) man page for more information.</td></tr>
<tr><td><b>debug</b></td><td>Specify (stdin) or increment (command line) debug level</td></tr>
+ <tr><td><b>delay</b></td><td>Wait this many seconds before fencing is started. fence_egenera(8)</td></tr>
<tr><td><b>device</b></td><td>The device the switch is connected to on the controlling host.</td></tr>
<tr><td><b>devices</b></td><td>List of devices to fence (separated by commas).</td></tr>
<tr><td><b>domain</b></td><td>Virtual Machine (domain name) to fence (deprecated)</td></tr>
<tr><td><b>drac_version</b></td><td>Force DRAC version to use</td></tr>
+ <tr><td><b>esh</b></td><td>Path to the esh command on the cserver. fence_egenera(8)</td></tr>
<tr><td><b>exec</b></td><td>Command to execute</td></tr>
<tr><td><b>hash</b></td><td>Packet hash strength (none, sha1, [sha256], sha512)</td></tr>
<tr><td><b>help</b></td><td>Display help and exit</td></tr>
+ <tr><td><b>hidden_page</b></td><td>Name of hidden page</td></tr>
<tr><td><b>hmc_version</b></td><td>Force HMC version to use (3 or 4)</td></tr>
<tr><td><b>identity_file</b></td><td>Identity file for ssh</td></tr>
<tr><td><b>inet4_only</b></td><td>Forces agent to use IPv4 addresses only</td></tr>
@@ -409,8 +425,11 @@ Defines the properties of a device used for fencing or unfencing a node. fenced(
<tr><td><b>lanplus</b></td><td>For IPMI LAN only. Set value to either True or 1; leave out for false.</td></tr>
<tr><td><b>logfile</b></td><td>Location to output logs from fence_scsi.</td></tr>
<tr><td><b>login</b></td><td>The login name used to access the device. </td></tr>
+ <tr><td><b>login_timeout</b></td><td>Wait X seconds for cmd prompt after login</td></tr>
+ <tr><td><b>lpan</b></td><td>The lpan to operate on. fence_egenera(8)</td></tr>
<tr><td><b>managed</b></td><td>Managed system name</td></tr>
<tr><td><b>method</b></td><td>Method to fence (onoff or cycle)</td></tr>
+ <tr><td><b>missing_as_off</b></td><td>Missing port returns OFF instead of failure</td></tr>
<tr><td><b>module_name</b></td><td>DRAC/MC module name</td></tr>
<tr><td><b>multicast_address</b></td><td>Multicast address (default=225.0.0.12 / ff05::3:1)</td></tr>
<tr><td><b>nodename</b></td><td>Name of the node to be fenced. Refer to fence_scsi(8) for more information.</td></tr>
@@ -419,7 +438,11 @@ Defines the properties of a device used for fencing or unfencing a node. fenced(
<tr><td><b>passwd</b></td><td>The password used to authenticate the connection to the device.</td></tr>
<tr><td><b>passwd_script</b></td><td>The script that supplies a password for access to the fence device. Using this supersedes the Password parameter.</td></tr>
<tr><td><b>port</b></td><td>The switch outlet number.</td></tr>
+ <tr><td><b>power_timeout</b></td><td>Test X seconds for status change after ON/OFF</td></tr>
+ <tr><td><b>power_wait</b></td><td>Wait X seconds after issuing ON/OFF</td></tr>
+ <tr><td><b>pserver</b></td><td>The pserver to operate on. fence_egenera(8)</td></tr>
<tr><td><b>retrans</b></td><td>Multicast retransmit time (in 1/10sec; default=20)</td></tr>
+ <tr><td><b>retry_on</b></td><td>Count of attempts to retry power on</td></tr>
<tr><td><b>ribcl</b></td><td>Force ribcl version to use</td></tr>
<tr><td><b>rpowerpath</b></td><td></td></tr>
<tr><td><b>secure</b></td><td>SSH connection</td></tr>
@@ -427,6 +450,7 @@ Defines the properties of a device used for fencing or unfencing a node. fenced(
<tr><td><b>serial_device</b></td><td>Serial device (default=/dev/ttyS1)</td></tr>
<tr><td><b>serial_params</b></td><td>Serial Parameters (default=115200,8N1)</td></tr>
<tr><td><b>servers</b></td><td>The hostname of each GNBD to disable. For multiple hostnames, separate each hostname with a space.</td></tr>
+ <tr><td><b>shell_timeout</b></td><td>Wait X seconds for cmd prompt after issuing command</td></tr>
<tr><td><b>snmp_auth_prot</b></td><td>Set authentication protocol (MD5|SHA)</td></tr>
<tr><td><b>snmp_priv_passwd</b></td><td>Set privacy protocol password</td></tr>
<tr><td><b>snmp_priv_passwd_script</b></td><td>Script to run to retrieve privacy password</td></tr>
@@ -437,6 +461,7 @@ Defines the properties of a device used for fencing or unfencing a node. fenced(
<tr><td><b>switch</b></td><td>Physical switch number on device</td></tr>
<tr><td><b>timeout</b></td><td>Fencing timeout (in seconds; default=30)</td></tr>
<tr><td><b>udpport</b></td><td>UDP/TCP port to use for connection with device</td></tr>
+ <tr><td><b>user</b></td><td>See fence_egenera(8)</td></tr>
<tr><td><b>use_uuid</b></td><td>Treat [domain] as UUID instead of domain name. This is provided for compatibility with older fence_xvmd installations.</td></tr>
<tr><td><b>verbose</b></td><td>Verbose mode</td></tr>
<tr><td><b>version</b></td><td>Display version information and exit</td></tr>
@@ -526,13 +551,16 @@ Defines fence device properties. fenced(8)<br/>
<tr><td><b>community</b></td><td>Set the community string</td></tr>
<tr><td><b>cserver</b></td><td>The hostname (and optionally the username in the form of username@hostname) assigned to the device. Refer to the fence_egenera(8) man page for more information.</td></tr>
<tr><td><b>debug</b></td><td>Specify (stdin) or increment (command line) debug level</td></tr>
+ <tr><td><b>delay</b></td><td>Wait this many seconds before fencing is started. fence_egenera(8)</td></tr>
<tr><td><b>device</b></td><td>The device the switch is connected to on the controlling host.</td></tr>
<tr><td><b>devices</b></td><td>List of devices to fence (separated by commas).</td></tr>
<tr><td><b>domain</b></td><td>Virtual Machine (domain name) to fence (deprecated)</td></tr>
<tr><td><b>drac_version</b></td><td>Force DRAC version to use</td></tr>
+ <tr><td><b>esh</b></td><td>Path to the esh command on the cserver. fence_egenera(8)</td></tr>
<tr><td><b>exec</b></td><td>Command to execute</td></tr>
<tr><td><b>hash</b></td><td>Packet hash strength (none, sha1, [sha256], sha512)</td></tr>
<tr><td><b>help</b></td><td>Display help and exit</td></tr>
+ <tr><td><b>hidden_page</b></td><td>Name of hidden page</td></tr>
<tr><td><b>hmc_version</b></td><td>Force HMC version to use (3 or 4)</td></tr>
<tr><td><b>identity_file</b></td><td>Identity file for ssh</td></tr>
<tr><td><b>inet4_only</b></td><td>Forces agent to use IPv4 addresses only</td></tr>
@@ -546,8 +574,11 @@ Defines fence device properties. fenced(8)<br/>
<tr><td><b>lanplus</b></td><td>For IPMI LAN only. Set value to either True or 1; leave out for false.</td></tr>
<tr><td><b>logfile</b></td><td>Location to output logs from fence_scsi.</td></tr>
<tr><td><b>login</b></td><td>The login name used to access the device. </td></tr>
+ <tr><td><b>login_timeout</b></td><td>Wait X seconds for cmd prompt after login</td></tr>
+ <tr><td><b>lpan</b></td><td>The lpan to operate on. fence_egenera(8)</td></tr>
<tr><td><b>managed</b></td><td>Managed system name</td></tr>
<tr><td><b>method</b></td><td>Method to fence (onoff or cycle)</td></tr>
+ <tr><td><b>missing_as_off</b></td><td>Missing port returns OFF instead of failure</td></tr>
<tr><td><b>module_name</b></td><td>DRAC/MC module name</td></tr>
<tr><td><b>multicast_address</b></td><td>Multicast address (default=225.0.0.12 / ff05::3:1)</td></tr>
<tr><td><b>nodename</b></td><td>Name of the node to be fenced. Refer to fence_scsi(8) for more information.</td></tr>
@@ -556,7 +587,11 @@ Defines fence device properties. fenced(8)<br/>
<tr><td><b>passwd</b></td><td>The password used to authenticate the connection to the device.</td></tr>
<tr><td><b>passwd_script</b></td><td>The script that supplies a password for access to the fence device. Using this supersedes the Password parameter.</td></tr>
<tr><td><b>port</b></td><td>The switch outlet number.</td></tr>
+ <tr><td><b>power_timeout</b></td><td>Test X seconds for status change after ON/OFF</td></tr>
+ <tr><td><b>power_wait</b></td><td>Wait X seconds after issuing ON/OFF</td></tr>
+ <tr><td><b>pserver</b></td><td>The pserver to operate on. fence_egenera(8)</td></tr>
<tr><td><b>retrans</b></td><td>Multicast retransmit time (in 1/10sec; default=20)</td></tr>
+ <tr><td><b>retry_on</b></td><td>Count of attempts to retry power on</td></tr>
<tr><td><b>ribcl</b></td><td>Force ribcl version to use</td></tr>
<tr><td><b>rpowerpath</b></td><td></td></tr>
<tr><td><b>secure</b></td><td>SSH connection</td></tr>
@@ -564,6 +599,7 @@ Defines fence device properties. fenced(8)<br/>
<tr><td><b>serial_device</b></td><td>Serial device (default=/dev/ttyS1)</td></tr>
<tr><td><b>serial_params</b></td><td>Serial Parameters (default=115200,8N1)</td></tr>
<tr><td><b>servers</b></td><td>The hostname of each GNBD to disable. For multiple hostnames, separate each hostname with a space.</td></tr>
+ <tr><td><b>shell_timeout</b></td><td>Wait X seconds for cmd prompt after issuing command</td></tr>
<tr><td><b>snmp_auth_prot</b></td><td>Set authentication protocol (MD5|SHA)</td></tr>
<tr><td><b>snmp_priv_passwd</b></td><td>Set privacy protocol password</td></tr>
<tr><td><b>snmp_priv_passwd_script</b></td><td>Script to run to retrieve privacy password</td></tr>
@@ -574,6 +610,7 @@ Defines fence device properties. fenced(8)<br/>
<tr><td><b>switch</b></td><td>Physical switch number on device</td></tr>
<tr><td><b>timeout</b></td><td>Fencing timeout (in seconds; default=30)</td></tr>
<tr><td><b>udpport</b></td><td>UDP/TCP port to use for connection with device</td></tr>
+ <tr><td><b>user</b></td><td>See fence_egenera(8)</td></tr>
<tr><td><b>use_uuid</b></td><td>Treat [domain] as UUID instead of domain name. This is provided for compatibility with older fence_xvmd installations.</td></tr>
<tr><td><b>verbose</b></td><td>Verbose mode</td></tr>
<tr><td><b>version</b></td><td>Display version information and exit</td></tr>
@@ -632,6 +669,8 @@ Defines a file system mount.<br/>
<tr><td><b>__failure_expire_time</b></td><td>Amount of time before a failure is forgotten.</td></tr>
<tr><td><b>__independent_subtree</b></td><td>Treat this and all children as an independent subtree.</td></tr>
<tr><td><b>__max_failures</b></td><td>Maximum number of failures before returning a failure to a status check.</td></tr>
+ <tr><td><b>__max_restarts</b></td><td>Maximum number restarts for an independent subtree before giving up.</td></tr>
+ <tr><td><b>__restart_expire_time</b></td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr>
</table><br/>
Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
<h3><a name="tag_gfs_controld"/>gfs_controld</h3>
@@ -681,6 +720,7 @@ This is an IP address.<br/>
<br/>
<table><tr valign="top"><td>Attribute</td><td>Description</td></tr>
<tr><td><b>address</b></td><td>IP Address</td></tr>
+ <tr><td><b>disable_rdisc</b></td><td>Disable updating of routing using RDISC protocol</td></tr>
<tr><td><b>family</b></td><td>Family</td></tr>
<tr><td><b>monitor_link</b></td><td>Monitor NIC Link</td></tr>
<tr><td><b>nfslock</b></td><td>Enable NFS lock workarounds</td></tr>
@@ -690,6 +730,8 @@ This is an IP address.<br/>
<tr><td><b>__failure_expire_time</b></td><td>Amount of time before a failure is forgotten.</td></tr>
<tr><td><b>__independent_subtree</b></td><td>Treat this and all children as an independent subtree.</td></tr>
<tr><td><b>__max_failures</b></td><td>Maximum number of failures before returning a failure to a status check.</td></tr>
+ <tr><td><b>__max_restarts</b></td><td>Maximum number restarts for an independent subtree before giving up.</td></tr>
+ <tr><td><b>__restart_expire_time</b></td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr>
</table><br/>
Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
<h3><a name="tag_lockspace"/>lockspace</h3>
@@ -742,6 +784,8 @@ LVM Failover script<br/>
<tr><td><b>__failure_expire_time</b></td><td>Amount of time before a failure is forgotten.</td></tr>
<tr><td><b>__independent_subtree</b></td><td>Treat this and all children as an independent subtree.</td></tr>
<tr><td><b>__max_failures</b></td><td>Maximum number of failures before returning a failure to a status check.</td></tr>
+ <tr><td><b>__max_restarts</b></td><td>Maximum number restarts for an independent subtree before giving up.</td></tr>
+ <tr><td><b>__restart_expire_time</b></td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr>
</table><br/>
Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
<h3><a name="tag_master"/>master</h3>
@@ -782,6 +826,8 @@ Defines a MySQL database server<br/>
<tr><td><b>__failure_expire_time</b></td><td>Amount of time before a failure is forgotten.</td></tr>
<tr><td><b>__independent_subtree</b></td><td>Treat this and all children as an independent subtree.</td></tr>
<tr><td><b>__max_failures</b></td><td>Maximum number of failures before returning a failure to a status check.</td></tr>
+ <tr><td><b>__max_restarts</b></td><td>Maximum number restarts for an independent subtree before giving up.</td></tr>
+ <tr><td><b>__restart_expire_time</b></td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr>
</table><br/>
Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
<h3><a name="tag_named"/>named</h3>
@@ -800,6 +846,8 @@ Defines an instance of named server<br/>
<tr><td><b>__failure_expire_time</b></td><td>Amount of time before a failure is forgotten.</td></tr>
<tr><td><b>__independent_subtree</b></td><td>Treat this and all children as an independent subtree.</td></tr>
<tr><td><b>__max_failures</b></td><td>Maximum number of failures before returning a failure to a status check.</td></tr>
+ <tr><td><b>__max_restarts</b></td><td>Maximum number restarts for an independent subtree before giving up.</td></tr>
+ <tr><td><b>__restart_expire_time</b></td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr>
</table><br/>
Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
<h3><a name="tag_netfs"/>netfs</h3>
@@ -819,6 +867,8 @@ Defines an NFS/CIFS file system mount.<br/>
<tr><td><b>__failure_expire_time</b></td><td>Amount of time before a failure is forgotten.</td></tr>
<tr><td><b>__independent_subtree</b></td><td>Treat this and all children as an independent subtree.</td></tr>
<tr><td><b>__max_failures</b></td><td>Maximum number of failures before returning a failure to a status check.</td></tr>
+ <tr><td><b>__max_restarts</b></td><td>Maximum number restarts for an independent subtree before giving up.</td></tr>
+ <tr><td><b>__restart_expire_time</b></td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr>
</table><br/>
Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
<h3><a name="tag_nfsclient"/>nfsclient</h3>
@@ -839,6 +889,8 @@ Defines an NFS client.<br/>
<tr><td><b>__failure_expire_time</b></td><td>Amount of time before a failure is forgotten.</td></tr>
<tr><td><b>__independent_subtree</b></td><td>Treat this and all children as an independent subtree.</td></tr>
<tr><td><b>__max_failures</b></td><td>Maximum number of failures before returning a failure to a status check.</td></tr>
+ <tr><td><b>__max_restarts</b></td><td>Maximum number restarts for an independent subtree before giving up.</td></tr>
+ <tr><td><b>__restart_expire_time</b></td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr>
</table><br/>
Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
<h3><a name="tag_nfsexport"/>nfsexport</h3>
@@ -854,6 +906,8 @@ This defines an NFS export.<br/>
<tr><td><b>__failure_expire_time</b></td><td>Amount of time before a failure is forgotten.</td></tr>
<tr><td><b>__independent_subtree</b></td><td>Treat this and all children as an independent subtree.</td></tr>
<tr><td><b>__max_failures</b></td><td>Maximum number of failures before returning a failure to a status check.</td></tr>
+ <tr><td><b>__max_restarts</b></td><td>Maximum number restarts for an independent subtree before giving up.</td></tr>
+ <tr><td><b>__restart_expire_time</b></td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr>
</table><br/>
Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
<h3><a name="tag_nfsserver"/>nfsserver</h3>
@@ -868,6 +922,8 @@ This defines an NFS server resource.<br/>
<tr><td><b>__failure_expire_time</b></td><td>Amount of time before a failure is forgotten.</td></tr>
<tr><td><b>__independent_subtree</b></td><td>Treat this and all children as an independent subtree.</td></tr>
<tr><td><b>__max_failures</b></td><td>Maximum number of failures before returning a failure to a status check.</td></tr>
+ <tr><td><b>__max_restarts</b></td><td>Maximum number restarts for an independent subtree before giving up.</td></tr>
+ <tr><td><b>__restart_expire_time</b></td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr>
</table><br/>
Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
<h3><a name="tag_openldap"/>openldap</h3>
@@ -885,6 +941,8 @@ Defines an Open LDAP server<br/>
<tr><td><b>__failure_expire_time</b></td><td>Amount of time before a failure is forgotten.</td></tr>
<tr><td><b>__independent_subtree</b></td><td>Treat this and all children as an independent subtree.</td></tr>
<tr><td><b>__max_failures</b></td><td>Maximum number of failures before returning a failure to a status check.</td></tr>
+ <tr><td><b>__max_restarts</b></td><td>Maximum number restarts for an independent subtree before giving up.</td></tr>
+ <tr><td><b>__restart_expire_time</b></td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr>
</table><br/>
Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
<h3><a name="tag_oracledb"/>oracledb</h3>
@@ -902,6 +960,42 @@ Oracle 10g Failover Instance<br/>
<tr><td><b>__failure_expire_time</b></td><td>Amount of time before a failure is forgotten.</td></tr>
<tr><td><b>__independent_subtree</b></td><td>Treat this and all children as an independent subtree.</td></tr>
<tr><td><b>__max_failures</b></td><td>Maximum number of failures before returning a failure to a status check.</td></tr>
+ <tr><td><b>__max_restarts</b></td><td>Maximum number restarts for an independent subtree before giving up.</td></tr>
+ <tr><td><b>__restart_expire_time</b></td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr>
+</table><br/>
+Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
+<h3><a name="tag_orainstance"/>orainstance</h3>
+Oracle 10g Failover Instance<br/>
+<br/>
+<table><tr valign="top"><td>Attribute</td><td>Description</td></tr>
+ <tr><td><b>home</b></td><td>Oracle Home Directory</td></tr>
+ <tr><td><b>listeners</b></td><td>Oracle listeners</td></tr>
+ <tr><td><b>lockfile</b></td><td>Pathname for lockfile</td></tr>
+ <tr><td><b>name</b></td><td>Oracle SID</td></tr>
+ <tr><td><b>ref</b></td><td>Reference to existing orainstance resource in the resources section.</td></tr>
+ <tr><td><b>user</b></td><td>Oracle User Name</td></tr>
+ <tr><td><b>__enforce_timeouts</b></td><td>Consider a timeout for operations as fatal.</td></tr>
+ <tr><td><b>__failure_expire_time</b></td><td>Amount of time before a failure is forgotten.</td></tr>
+ <tr><td><b>__independent_subtree</b></td><td>Treat this and all children as an independent subtree.</td></tr>
+ <tr><td><b>__max_failures</b></td><td>Maximum number of failures before returning a failure to a status check.</td></tr>
+ <tr><td><b>__max_restarts</b></td><td>Maximum number restarts for an independent subtree before giving up.</td></tr>
+ <tr><td><b>__restart_expire_time</b></td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr>
+</table><br/>
+Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
+<h3><a name="tag_oralistener"/>oralistener</h3>
+Oracle 10g Listener Instance<br/>
+<br/>
+<table><tr valign="top"><td>Attribute</td><td>Description</td></tr>
+ <tr><td><b>home</b></td><td>Oracle Home Directory</td></tr>
+ <tr><td><b>name</b></td><td>Listener name</td></tr>
+ <tr><td><b>ref</b></td><td>Reference to existing oralistener resource in the resources section.</td></tr>
+ <tr><td><b>user</b></td><td>Oracle User Name</td></tr>
+ <tr><td><b>__enforce_timeouts</b></td><td>Consider a timeout for operations as fatal.</td></tr>
+ <tr><td><b>__failure_expire_time</b></td><td>Amount of time before a failure is forgotten.</td></tr>
+ <tr><td><b>__independent_subtree</b></td><td>Treat this and all children as an independent subtree.</td></tr>
+ <tr><td><b>__max_failures</b></td><td>Maximum number of failures before returning a failure to a status check.</td></tr>
+ <tr><td><b>__max_restarts</b></td><td>Maximum number restarts for an independent subtree before giving up.</td></tr>
+ <tr><td><b>__restart_expire_time</b></td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr>
</table><br/>
Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
<h3><a name="tag_postgres-8"/>postgres-8</h3>
@@ -919,6 +1013,8 @@ Defines a PostgreSQL server<br/>
<tr><td><b>__failure_expire_time</b></td><td>Amount of time before a failure is forgotten.</td></tr>
<tr><td><b>__independent_subtree</b></td><td>Treat this and all children as an independent subtree.</td></tr>
<tr><td><b>__max_failures</b></td><td>Maximum number of failures before returning a failure to a status check.</td></tr>
+ <tr><td><b>__max_restarts</b></td><td>Maximum number restarts for an independent subtree before giving up.</td></tr>
+ <tr><td><b>__restart_expire_time</b></td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr>
</table><br/>
Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
<h3><a name="tag_quorumd"/>quorumd</h3>
@@ -941,6 +1037,9 @@ This element and its attributes define parameters for the quorum disk daemon, qu
<tr><td><b>status_file</b></td><td>Debugging file. qdisk(5).</td></tr>
<tr><td><b>stop_cman</b></td><td>Stop cman if the quorum disk cannot be found during startup. qdisk(5).</td></tr>
<tr><td><b>tko</b></td><td>The number of cycles a node must miss to be declared dead. qdisk(5).</td></tr>
+ <tr><td><b>tko_up</b></td><td>Amount of positive changes before a host is considered online. qdisk(5).</td></tr>
+ <tr><td><b>upgrade_wait</b></td><td>Amount of cycles wait for conflicts for a bid for master status. qdisk(5).</td></tr>
+ <tr><td><b>use_uptime</b></td><td>Use /proc/uptime instead of gettimeofday(). qdisk(5).</td></tr>
<tr><td><b>votes</b></td><td>The number of votes the quorum daemon advertises to CMAN when it has a high enough score. qdisk(5).</td></tr>
</table><br/>
Children: <a href="#tag_heuristic">heuristic</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
@@ -975,6 +1074,8 @@ Dynamic smbd/nmbd resource agent<br/>
<tr><td><b>__failure_expire_time</b></td><td>Amount of time before a failure is forgotten.</td></tr>
<tr><td><b>__independent_subtree</b></td><td>Treat this and all children as an independent subtree.</td></tr>
<tr><td><b>__max_failures</b></td><td>Maximum number of failures before returning a failure to a status check.</td></tr>
+ <tr><td><b>__max_restarts</b></td><td>Maximum number restarts for an independent subtree before giving up.</td></tr>
+ <tr><td><b>__restart_expire_time</b></td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr>
</table><br/>
Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
<h3><a name="tag_SAPDatabase"/>SAPDatabase</h3>
@@ -1001,6 +1102,8 @@ SAP database resource agent<br/>
<tr><td><b>__failure_expire_time</b></td><td>Amount of time before a failure is forgotten.</td></tr>
<tr><td><b>__independent_subtree</b></td><td>Treat this and all children as an independent subtree.</td></tr>
<tr><td><b>__max_failures</b></td><td>Maximum number of failures before returning a failure to a status check.</td></tr>
+ <tr><td><b>__max_restarts</b></td><td>Maximum number restarts for an independent subtree before giving up.</td></tr>
+ <tr><td><b>__restart_expire_time</b></td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr>
</table><br/>
Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
<h3><a name="tag_SAPInstance"/>SAPInstance</h3>
@@ -1022,6 +1125,8 @@ SAP instance resource agent<br/>
<tr><td><b>__failure_expire_time</b></td><td>Amount of time before a failure is forgotten.</td></tr>
<tr><td><b>__independent_subtree</b></td><td>Treat this and all children as an independent subtree.</td></tr>
<tr><td><b>__max_failures</b></td><td>Maximum number of failures before returning a failure to a status check.</td></tr>
+ <tr><td><b>__max_restarts</b></td><td>Maximum number restarts for an independent subtree before giving up.</td></tr>
+ <tr><td><b>__restart_expire_time</b></td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr>
</table><br/>
Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
<h3><a name="tag_script"/>script</h3>
@@ -1036,6 +1141,8 @@ LSB-compliant init script as a clustered resource.<br/>
<tr><td><b>__failure_expire_time</b></td><td>Amount of time before a failure is forgotten.</td></tr>
<tr><td><b>__independent_subtree</b></td><td>Treat this and all children as an independent subtree.</td></tr>
<tr><td><b>__max_failures</b></td><td>Maximum number of failures before returning a failure to a status check.</td></tr>
+ <tr><td><b>__max_restarts</b></td><td>Maximum number restarts for an independent subtree before giving up.</td></tr>
+ <tr><td><b>__restart_expire_time</b></td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr>
</table><br/>
Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
<h3><a name="tag_service"/>service</h3>
@@ -1059,24 +1166,8 @@ Defines a service (resource group).<br/>
<tr><td><b>__failure_expire_time</b></td><td>Amount of time before a failure is forgotten.</td></tr>
<tr><td><b>__independent_subtree</b></td><td>Treat this and all children as an independent subtree.</td></tr>
<tr><td><b>__max_failures</b></td><td>Maximum number of failures before returning a failure to a status check.</td></tr>
-</table><br/>
-Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
-<h3><a name="tag_tomcat-5"/>tomcat-5</h3>
-Defines a Tomcat server<br/>
-<br/>
-<table><tr valign="top"><td>Attribute</td><td>Description</td></tr>
- <tr><td><b>catalina_base</b></td><td>Catalina base directory (differs for each service)</td></tr>
- <tr><td><b>catalina_options</b></td><td>Other command-line options for Catalina</td></tr>
- <tr><td><b>config_file</b></td><td>Config File</td></tr>
- <tr><td><b>name</b></td><td>Name</td></tr>
- <tr><td><b>ref</b></td><td>Reference to existing tomcat-5 resource in the resources section.</td></tr>
- <tr><td><b>service_name</b></td><td>Inherit the service name.</td></tr>
- <tr><td><b>shutdown_wait</b></td><td>Wait X seconds for correct end of service shutdown</td></tr>
- <tr><td><b>tomcat_user</b></td><td>User who runs the Tomcat server</td></tr>
- <tr><td><b>__enforce_timeouts</b></td><td>Consider a timeout for operations as fatal.</td></tr>
- <tr><td><b>__failure_expire_time</b></td><td>Amount of time before a failure is forgotten.</td></tr>
- <tr><td><b>__independent_subtree</b></td><td>Treat this and all children as an independent subtree.</td></tr>
- <tr><td><b>__max_failures</b></td><td>Maximum number of failures before returning a failure to a status check.</td></tr>
+ <tr><td><b>__max_restarts</b></td><td>Maximum number restarts for an independent subtree before giving up.</td></tr>
+ <tr><td><b>__restart_expire_time</b></td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr>
</table><br/>
Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
<h3><a name="tag_tomcat-6"/>tomcat-6</h3>
@@ -1092,6 +1183,8 @@ Defines a Tomcat server<br/>
<tr><td><b>__failure_expire_time</b></td><td>Amount of time before a failure is forgotten.</td></tr>
<tr><td><b>__independent_subtree</b></td><td>Treat this and all children as an independent subtree.</td></tr>
<tr><td><b>__max_failures</b></td><td>Maximum number of failures before returning a failure to a status check.</td></tr>
+ <tr><td><b>__max_restarts</b></td><td>Maximum number restarts for an independent subtree before giving up.</td></tr>
+ <tr><td><b>__restart_expire_time</b></td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr>
</table><br/>
Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
<h3><a name="tag_totem"/>totem</h3>
@@ -1140,6 +1233,8 @@ Defines a Virtual Machine<br/>
<tr><td><b>__failure_expire_time</b></td><td>Amount of time before a failure is forgotten.</td></tr>
<tr><td><b>__independent_subtree</b></td><td>Treat this and all children as an independent subtree.</td></tr>
<tr><td><b>__max_failures</b></td><td>Maximum number of failures before returning a failure to a status check.</td></tr>
+ <tr><td><b>__max_restarts</b></td><td>Maximum number restarts for an independent subtree before giving up.</td></tr>
+ <tr><td><b>__restart_expire_time</b></td><td>Amount of time before a failure is forgotten for an independent subtree.</td></tr>
</table><br/>
Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
</html>
13 years, 3 months
cluster: RHEL6 - config: Update schema
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: a6d691f0925effe140e5970522eb1c560da9802e
Parent: 3505bc008d71100acf8b11bcfc494873904957ef
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Thu Feb 3 16:34:30 2011 -0500
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Thu Feb 3 17:46:01 2011 -0500
config: Update schema
Resolves: rhbz#618705
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
config/tools/xml/cluster.rng.in | 848 ++++++++++++++++++++++++++++++++++++---
1 files changed, 783 insertions(+), 65 deletions(-)
diff --git a/config/tools/xml/cluster.rng.in b/config/tools/xml/cluster.rng.in
index 505e07a..75bbd28 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"/>
+ <attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/>
</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."/>
- </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"/>
@@ -2386,6 +2558,11 @@ To validate your cluster.conf against this schema, run:
<!-- end non-generated device definitions -->
<!-- begin auto-generated device definitions -->
+ <!-- No metadata for fencing.py -->
+ <!-- No metadata for fencing_snmp.py -->
+ <!-- No metadata for fence_nss_wrapper -->
+ <!-- No metadata for fence_vmware_helper -->
+
<!-- fence_vmware -->
<group>
<optional>
@@ -2419,6 +2596,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 +2616,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 +2661,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 +2699,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 +2776,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 +2868,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,6 +2957,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>
@@ -2726,6 +3002,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 +3019,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,8 +3084,120 @@ 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_bladecenter_snmp -->
+ <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="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" />
+ </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 -->
<!-- fence_ipmilan -->
<group>
@@ -2826,7 +3223,7 @@ To validate your cluster.conf against this schema, run:
<attribute name="login" rha:description="Username/Login (if required) to control power on IPMI device" />
</optional>
<optional>
- <attribute name="action" rha:description="Operation to perform. Valid operations: on, off, reboot, status, list, monitor or metadata" />
+ <attribute name="action" rha:description="Operation to perform. Valid operations: on, off, reboot, status, list, diag, monitor or metadata" />
</optional>
<optional>
<attribute name="timeout" rha:description="Timeout (sec) for IPMI operation" />
@@ -2838,6 +3235,12 @@ To validate your cluster.conf against this schema, run:
<attribute name="method" rha:description="Method to fence (onoff or cycle)" />
</optional>
<optional>
+ <attribute name="power_wait" rha:description="Wait X seconds after on/off operation" />
+ </optional>
+ <optional>
+ <attribute name="delay" rha:description="Wait X seconds before fencing is started" />
+ </optional>
+ <optional>
<attribute name="verbose" rha:description="Verbose mode" />
</optional>
</group>
@@ -2870,6 +3273,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="ipport" rha:description="TCP port to use for connection with device" />
</optional>
<optional>
@@ -2884,6 +3290,92 @@ 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_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>
+ <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_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 +3432,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 +3482,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 +3511,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 +3560,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 +3592,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 +3666,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 +3695,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 +3743,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 +3772,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 +3817,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 +3840,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 +3882,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 +3974,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 +4064,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 +4132,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 +4221,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 -->
13 years, 3 months
fence-agents: master - Fix build for distributions that don't use bash as default shell
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=com...
Commit: 554f73026756db98249997f03a57dd2f6cb9c743
Parent: 39e735e3091706af66ab7bd56135eee441878d51
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Thu Feb 3 21:47:15 2011 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Thu Feb 3 21:47:15 2011 +0100
Fix build for distributions that don't use bash as default shell
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
make/fencebuild.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/make/fencebuild.mk b/make/fencebuild.mk
index c53d226..5da3128 100644
--- a/make/fencebuild.mk
+++ b/make/fencebuild.mk
@@ -1,5 +1,5 @@
$(TARGET):
- sh $(top_srcdir)/scripts/fenceparse \
+ bash $(top_srcdir)/scripts/fenceparse \
$(top_srcdir)/make/copyright.cf REDHAT_COPYRIGHT \
$(VERSION) \
$(abs_srcdir) $@ | \
13 years, 3 months
cluster: RHEL6 - build: allow dbus notification code to be disabled
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 3505bc008d71100acf8b11bcfc494873904957ef
Parent: c37913ef41d4284da754a7044f72f4419d4f6b1c
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Wed Feb 2 10:34:58 2011 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Thu Feb 3 21:27:55 2011 +0100
build: allow dbus notification code to be disabled
default is to build with dbus support
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
configure | 7 +++++++
make/defines.mk.input | 1 +
rgmanager/src/daemons/Makefile | 6 +++++-
3 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/configure b/configure
index cde3be6..2644fa7 100755
--- a/configure
+++ b/configure
@@ -88,6 +88,7 @@ my %options = (
enable_legacy_code => \$enable_legacy_code,
enable_contrib => \$enable_contrib,
enable_pacemaker => \$enable_pacemaker,
+ disable_dbus => \$disable_dbus,
somajor => \$somajor,
sominor => \$sominor,
release_version => \$release_version,
@@ -179,6 +180,7 @@ my $err = &GetOptions (\%options,
'enable_legacy_code',
'enable_contrib',
'enable_pacemaker',
+ 'disable_dbus',
'without_common',
'without_config',
'without_cman',
@@ -274,6 +276,7 @@ if ($help || !$err) {
print "--enable_contrib\tEnable build of community contributed code/tools. (Default: no)\n";
print "--enable_legacy_code\tEnable build of old/obsolete/unsupported code/tools. (Default: no)\n";
print "--enable_pacemaker\tEnable building of Pacemaker-specific pieces\n";
+ print "--disable_dbus\tDisable built-in support for dbus notifications. (Default: no)\n";
print "--without_common\tDisable common building (Default: enabled)\n";
print "--without_config\tDisable config building (Default: enabled)\n";
print "--without_cman\tDisable cman building (Default: enabled)\n";
@@ -620,6 +623,9 @@ if (!$enable_legacy_code) {
if (!$enable_pacemaker) {
$enable_pacemaker="";
}
+if (!$disable_dbus) {
+ $disable_dbus="";
+}
if (!$without_common) {
$without_common="";
}
@@ -775,6 +781,7 @@ while (<IFILE>) {
$_ =~ s/\@ENABLE_LEGACY_CODE\@/$enable_legacy_code/;
$_ =~ s/\@ENABLE_CONTRIB\@/$enable_contrib/;
$_ =~ s/\@ENABLE_PACEMAKER\@/$enable_pacemaker/;
+ $_ =~ s/\@DISABLE_DBUS\@/$disable_dbus/;
$_ =~ s/\@DISABLE_COMMON\@/$without_common/;
$_ =~ s/\@DISABLE_CONFIG\@/$without_config/;
$_ =~ s/\@DISABLE_CMAN\@/$without_cman/;
diff --git a/make/defines.mk.input b/make/defines.mk.input
index 2834872..ca6a4d7 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -74,6 +74,7 @@ legacy_code ?= @ENABLE_LEGACY_CODE@
contrib_code ?= @ENABLE_CONTRIB@
enable_pacemaker ?= @ENABLE_PACEMAKER@
enable_gfs-kernel/src/gfs ?= @ENABLE_GFSKERNEL@
+disable_dbus ?= @DISABLE_DBUS@
without_common ?= @DISABLE_COMMON@
without_config ?= @DISABLE_CONFIG@
without_cman ?= @DISABLE_CMAN@
diff --git a/rgmanager/src/daemons/Makefile b/rgmanager/src/daemons/Makefile
index 9619990..7218c53 100644
--- a/rgmanager/src/daemons/Makefile
+++ b/rgmanager/src/daemons/Makefile
@@ -47,7 +47,6 @@ CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${logtincdir}
CFLAGS += `xml2-config --cflags` -I${slangincdir}
CFLAGS += -I$(S)/../../include
CFLAGS += -I${incdir}
-CFLAGS += `pkg-config --cflags dbus-1`
NOCCS_CFLAGS += -DNO_CCS
@@ -61,7 +60,12 @@ DLM_LDFLAGS += -L${dlmlibdir} -ldlm
XML2_LDFLAGS += `xml2-config --libs`
SLANG_LDFLAGS += -L${slanglibdir} -lslang
EXTRA_LDFLAGS += -lpthread
+
+# dbus support for notifications
+ifndef disable_dbus
+CFLAGS += -DDBUS `pkg-config --cflags dbus-1`
DBUS_LDFLAGS += `pkg-config --libs dbus-1`
+endif
LDDEPS += ../clulib/libclulib.a
13 years, 3 months
cluster: RHEL6 - rgmanager: Match fenced's option to disable DBus
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: c37913ef41d4284da754a7044f72f4419d4f6b1c
Parent: 6f7651001c3ab013f0d8bd68d0ff08978817c6dd
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Wed Feb 2 14:21:29 2011 -0500
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Thu Feb 3 15:12:00 2011 -0500
rgmanager: Match fenced's option to disable DBus
Resolves: rhbz#657756
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
rgmanager/man/rgmanager.8 | 2 +-
rgmanager/src/daemons/main.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/rgmanager/man/rgmanager.8 b/rgmanager/man/rgmanager.8
index a4e2c73..2b018d2 100644
--- a/rgmanager/man/rgmanager.8
+++ b/rgmanager/man/rgmanager.8
@@ -371,7 +371,7 @@ will leave the virtual machine running.
Run in the foreground (do not fork).
.IP \-d
Enable debug-level logging.
-.IP \-D
+.IP \-q
Disable DBus signals which are normally sent when services change state.
.IP \-w
Disable internal process monitoring (for debugging).
diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c
index dad379a..02cd2dc 100644
--- a/rgmanager/src/daemons/main.c
+++ b/rgmanager/src/daemons/main.c
@@ -951,7 +951,7 @@ main(int argc, char **argv)
pthread_t th;
cman_handle_t clu = NULL;
- while ((rv = getopt(argc, argv, "wfdND")) != EOF) {
+ while ((rv = getopt(argc, argv, "wfdNq")) != EOF) {
switch (rv) {
case 'w':
wd = 0;
@@ -965,7 +965,7 @@ main(int argc, char **argv)
case 'f':
foreground = 1;
break;
- case 'D':
+ case 'q':
rgm_dbus_notify = 0;
break;
default:
13 years, 3 months