November 2009 - cluster-commits - Fedora Mailing-Lists

cluster: RHEL54 - CMAN: fix error in regular expression

by rohara

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=... Commit: eb0da3897be8b752b7abbabcdf1a871ad3aec9e4 Parent: 9d07609c3cd7677a7f1a7b94e7196cf6f9e02a21 Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Mon Nov 16 09:42:02 2009 -0600 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Mon Nov 16 09:43:58 2009 -0600 CMAN: fix error in regular expression A previous commit had an error in the regular expression used to identify multipath devices built on partitions. rhbz#529712 --- fence/agents/scsi/scsi_reserve | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fence/agents/scsi/scsi_reserve b/fence/agents/scsi/scsi_reserve index 31a1e17..4262fbc 100755 --- a/fence/agents/scsi/scsi_reserve +++ b/fence/agents/scsi/scsi_reserve @@ -110,7 +110,7 @@ do # if [[ $dm_uuid =~ "^mpath" ]]; then dm_devices="$dm_devices $( ls /sys/block/${pv_dev:5}/slaves/ )" - elif [[ $dm_uuid =~ "^part[0-9]-mpath" ]]; then + elif [[ $dm_uuid =~ "^part[0-9]*-mpath" ]]; then dm_slave=$( ls /sys/block/${pv_dev:5}/slaves/ ) dm_devices="$dm_devices $( ls /sys/block/${dm_slave}/slaves/ )" else

14 years, 5 months

1
0
0 / 0

cluster: RHEL54 - rgmanager: Use RG_START_RECOVER after relo failure

by Lon Hohberger

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=... Commit: 9d07609c3cd7677a7f1a7b94e7196cf6f9e02a21 Parent: 66cc2cb57097f6a8bca9e747766b6e9a0f261969 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Thu Oct 22 16:04:23 2009 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Mon Nov 16 10:25:06 2009 -0500 rgmanager: Use RG_START_RECOVER after relo failure rgmanager correctly tries to restart a service all around the cluster in the event of failures when using RG_ENABLE (e.g. clusvcadm -e), but if a relocation operation fails, the service can end up stuck in the 'recovering' state. This is because we were not switching to the RG_START_RECOVER operation after the first relocation attempt failed. Resolves: rhbz530409 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/daemons/rg_state.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c index 08f212c..31664b9 100644 --- a/rgmanager/src/daemons/rg_state.c +++ b/rgmanager/src/daemons/rg_state.c @@ -1727,14 +1727,14 @@ svc_start_remote(char *svcName, int request, uint32_t target) * @param new_owner Member who actually ends up owning the service. */ int -handle_relocate_req(char *svcName, int request, int preferred_target, +handle_relocate_req(char *svcName, int orig_request, int preferred_target, int *new_owner) { cluster_member_list_t *allowed_nodes = NULL, *backup = NULL; cman_node_t *m; - int target = preferred_target, me = my_id(); - int ret, x; rg_state_t svcStatus; + int target = preferred_target, me = my_id(); + int ret, x, request = orig_request; get_rg_state_local(svcName, &svcStatus); if (svcStatus.rs_state == RG_STATE_DISABLED || @@ -1836,6 +1836,13 @@ handle_relocate_req(char *svcName, int request, int preferred_target, */ return 0; } + + /* + * Failed to start on that node. + * Use the START_RECOVER operation on subsequent + * attempts. + */ + request = RG_START_RECOVER; } } @@ -1870,6 +1877,10 @@ handle_relocate_req(char *svcName, int request, int preferred_target, return 0; case RG_EDEPEND: case RG_EFAIL: + /* Uh oh - we failed to relocate to this node. + ensure that we tell the next node to start it from + the 'recovering' state. */ + request = RG_START_RECOVER; memb_mark_down(allowed_nodes, target); continue; case RG_EABORT: @@ -1902,7 +1913,7 @@ handle_relocate_req(char *svcName, int request, int preferred_target, * We got sent here from handle_start_req. * We're DONE. */ - if (request == RG_START_RECOVER) { + if (orig_request == RG_START_RECOVER) { _svc_stop_finish(svcName, 0, RG_STATE_STOPPED); return RG_EFAIL; }

14 years, 5 months

1
0
0 / 0

cluster: RHEL54 - rgmanager: Fix error recovery with central_processing

by Lon Hohberger

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=... Commit: 66cc2cb57097f6a8bca9e747766b6e9a0f261969 Parent: 8ade465e53467b42f7d65f2f322a99fe85451497 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Mon Oct 26 17:38:42 2009 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Mon Nov 16 10:25:00 2009 -0500 rgmanager: Fix error recovery with central_processing Resolves: rhbz#530409 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/daemons/rg_state.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c index 3660b71..08f212c 100644 --- a/rgmanager/src/daemons/rg_state.c +++ b/rgmanager/src/daemons/rg_state.c @@ -2127,7 +2127,8 @@ handle_start_remote_req(char *svcName, int req) if (need_check) pthread_mutex_unlock(&exclusive_mutex); - if (svc_stop(svcName, RG_STOP_RECOVER) == 0) + if (svc_stop(svcName, central_events_enabled() ? + RG_STATE_STOPPED : RG_STOP_RECOVER) == 0) return RG_EFAIL; svc_fail(svcName);

14 years, 5 months

1
0
0 / 0

cluster: RHEL54 - rgmanager: Fix path evaluation during force unmount

by Lon Hohberger

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=... Commit: 8ade465e53467b42f7d65f2f322a99fe85451497 Parent: 824ef53315c857442270649d6381439cffd7d71a Author: Marc Milgram <mmilgram(a)redhat.com> AuthorDate: Wed Oct 14 17:15:47 2009 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Mon Nov 16 10:24:32 2009 -0500 rgmanager: Fix path evaluation during force unmount Resolves: rhbz514040 Signed-off-by: Marc Milgram <mmilgram(a)redhat.com> Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/resources/fs.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/resources/fs.sh b/rgmanager/src/resources/fs.sh index cc2ff02..ac41cf3 100755 --- a/rgmanager/src/resources/fs.sh +++ b/rgmanager/src/resources/fs.sh @@ -747,7 +747,7 @@ killMountProcesses() kill -TERM $pid fi done < <(lsof -bn 2>/dev/null | \ - grep -E "$mp(/.*|)\$" | \ + grep -E " $mp(/| |$)" | \ awk '{print $1,$2,$3}' | \ sort -u -k 1,3) elif [ -n "$have_fuser" ]; then

14 years, 5 months

1
0
0 / 0

cluster: RHEL54 - rgmanager: Simplify bonded link checking

by Lon Hohberger

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=... Commit: 824ef53315c857442270649d6381439cffd7d71a Parent: f6c4f1c70c16029f2f95e4aae785456d071e9652 Author: Flavio Leitner <fleitner(a)redhat.com> AuthorDate: Tue Sep 29 09:40:32 2009 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Mon Nov 16 10:24:10 2009 -0500 rgmanager: Simplify bonded link checking The new bonding driver version 3.4.0 provides ethtool get_link operation so, now, usual link checking works for bonding devices. Resolves: bz518037 Signed-off-by: Flavio Leitner <fleitner(a)redhat.com> Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/resources/ip.sh | 75 +--------------------------------------- 1 files changed, 2 insertions(+), 73 deletions(-) diff --git a/rgmanager/src/resources/ip.sh b/rgmanager/src/resources/ip.sh index ec69eb8..d9bc517 100755 --- a/rgmanager/src/resources/ip.sh +++ b/rgmanager/src/resources/ip.sh @@ -428,46 +428,6 @@ ipv6_list_interfaces() } -# -# Find slaves for a bonded interface -# -findSlaves() -{ - declare mastif=$1 - declare line - declare intf - declare interfaces - - if [ -z "$mastif" ]; then - ocf_log err "usage: findSlaves <master I/F>" - return $OCF_ERR_ARGS - fi - - line=$(/sbin/ip link list dev $mastif | grep "<.*MASTER.*>") - if [ $? -ne 0 ]; then - ocf_log err "Error determining status of $mastif" - return $OCF_ERR_GENERIC - fi - - if [ -z "`/sbin/ip link list dev $mastif | grep \"<.*MASTER.*>\"`" ] - then - ocf_log err "$mastif is not a master device" - return $OCF_ERR_GENERIC - fi - - ## Strip possible VLAN (802.1q) suffixes - ## - Roland Gadinger <roland.gadinger(a)beko.at> - mastif=${mastif%%.*} - - while read line; do - set - $line - interfaces="${2/:/} $interfaces" - done < <( /sbin/ip -o link list | grep "master $mastif" ) - - echo $interfaces -} - - isSlave() { declare intf=$1 @@ -547,39 +507,8 @@ network_link_up() return 1 fi - # - # XXX assumes bond* interfaces are the bonding driver. (Fair - # assumption on Linux, I think) - # - if [ "${intf_arg/bond/}" != "$intf_arg" ]; then - - # - # With Xen we must check for slaves of pbondX, not bondX - # - masterif=$intf_arg - line=$(ip link list | awk {'print $2'} | grep "p$intf_arg:") - if [ $? -eq 0 ] ; then - masterif="p$intf_arg" - fi - - # - # Bonded driver. Check link of all slaves for this interface. - # If any link is up, the bonding driver is expected to route - # traffic through that link. Thus, the entire bonded link - # is declared up. - # - slaves=$(findSlaves $masterif) - if [ $? -ne 0 ]; then - ocf_log err "Error finding slaves of $intf_arg" - return 1 - fi - for intf_test in $slaves; do - ethernet_link_up $intf_test && link_up=0 - done - else - ethernet_link_up $intf_arg - link_up=$? - fi + ethernet_link_up $intf_arg + link_up=$? if [ $link_up -eq 0 ]; then ocf_log debug "Link for $intf_arg: Detected"

14 years, 5 months

1
0
0 / 0

cluster: RHEL54 - rgmanager: Fix missing path attribute handling

by Lon Hohberger

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=... Commit: f6c4f1c70c16029f2f95e4aae785456d071e9652 Parent: 24e3de3487263c918c7be581209243bb84f1d265 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Thu Aug 27 15:12:46 2009 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Mon Nov 16 10:23:48 2009 -0500 rgmanager: Fix missing path attribute handling If using the Xen hypervisor with vm configs in a non standard location (e.g. not /etc/xen), rgmanager was ignoring the path attribute, preventing VM management. Resolves: rhbz#519786 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/resources/vm.sh | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/rgmanager/src/resources/vm.sh b/rgmanager/src/resources/vm.sh index 24e286d..df0c9b7 100755 --- a/rgmanager/src/resources/vm.sh +++ b/rgmanager/src/resources/vm.sh @@ -141,6 +141,17 @@ meta_data() <content type="string" default="live"/> </parameter> + <parameter name="path"> + <longdesc lang="en"> + Path specification 'xm create' will search for the specified + VM configuration file + </longdesc> + <shortdesc lang="en"> + Path to virtual machine configuration files + </shortdesc> + <content type="string"/> + </parameter> + <parameter name="snapshot"> <longdesc lang="en"> Path to the snapshot directory where the virtual machine

14 years, 5 months

1
0
0 / 0

cluster: RHEL54 - qdiskd: Make qdiskd stop crying wolf

by Lon Hohberger

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=... Commit: 24e3de3487263c918c7be581209243bb84f1d265 Parent: d8b5762fbe018bba8282492d41f6231d2ce8930e Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Mon Nov 2 17:30:38 2009 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Mon Nov 16 10:17:19 2009 -0500 qdiskd: Make qdiskd stop crying wolf The I/O hang check timer in qdiskd was somehow being woken up twice on rare occasion, causing qdiskd to falsely report an I/O hang when there were no actual problems with the system. Resolves: rhbz#532773 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- cman/qdisk/iostate.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/cman/qdisk/iostate.c b/cman/qdisk/iostate.c index f4f2329..65b4d50 100644 --- a/cman/qdisk/iostate.c +++ b/cman/qdisk/iostate.c @@ -49,11 +49,12 @@ io_state(iostate_t state) pthread_mutex_lock(&state_mutex); main_state = state; main_incarnation++; /* it does not matter if this wraps. */ - pthread_mutex_unlock(&state_mutex); /* Optimization: Don't signal on STATE_NONE */ if (state != STATE_NONE) pthread_cond_broadcast(&state_cond); + + pthread_mutex_unlock(&state_mutex); }

14 years, 5 months

1
0
0 / 0

cluster: STABLE3 - config: Update cluster schema with new fence agent info

by Lon Hohberger

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=... Commit: 061ffc32488b5547e804be08f2db85836a87ebc9 Parent: 0cb1e06264c37d5bf8fede90a6a93a1bc1927357 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Fri Nov 13 18:23:22 2009 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Fri Nov 13 18:23:22 2009 -0500 config: Update cluster schema with new fence agent info Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- config/plugins/ldap/99cluster.ldif | 150 +++++- config/plugins/ldap/ldap-base.csv | 24 +- config/tools/xml/cluster.rng.in | 982 +++++++++++++++++++++++++++++++----- 3 files changed, 1017 insertions(+), 139 deletions(-) diff --git a/config/plugins/ldap/99cluster.ldif b/config/plugins/ldap/99cluster.ldif index b740fa3..8350a65 100644 --- a/config/plugins/ldap/99cluster.ldif +++ b/config/plugins/ldap/99cluster.ldif @@ -1,4 +1,4 @@ -# Auto-generated @ 2009-11-12 13:21:51 +# Auto-generated @ 2009-11-13 18:23:07 dn: cn=schema attributeTypes: ( 1.3.6.1.4.1.2312.8.1.1.15 NAME 'rhcsAlias' @@ -565,13 +565,25 @@ attributeTypes: ( SINGLE-VALUE ) attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.51 NAME 'rhcsOption' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( 1.3.6.1.4.1.2312.8.1.1.50 NAME 'rhcsAction' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) attributeTypes: ( - 1.3.6.1.4.1.2312.8.1.1.51 NAME 'rhcsOption' + 1.3.6.1.4.1.2312.8.1.1.59 NAME 'rhcsExec' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.60 NAME 'rhcsVmware-type' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE @@ -583,25 +595,31 @@ attributeTypes: ( SINGLE-VALUE ) attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.61 NAME 'rhcsVmware-datacenter' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( 1.3.6.1.4.1.2312.8.1.1.53 NAME 'rhcsVerbose' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) attributeTypes: ( - 1.3.6.1.4.1.2312.8.1.1.54 NAME 'rhcsSwitch' + 1.3.6.1.4.1.2312.8.1.1.245 NAME 'rhcsVersion' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) attributeTypes: ( - 1.3.6.1.4.1.2312.8.1.1.55 NAME 'rhcsIdentity-file' + 1.3.6.1.4.1.2312.8.1.1.246 NAME 'rhcsHelp' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) attributeTypes: ( - 1.3.6.1.4.1.2312.8.1.1.56 NAME 'rhcsSsl' + 1.3.6.1.4.1.2312.8.1.1.247 NAME 'rhcsSeparator' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE @@ -619,19 +637,85 @@ attributeTypes: ( SINGLE-VALUE ) attributeTypes: ( - 1.3.6.1.4.1.2312.8.1.1.59 NAME 'rhcsExec' + 1.3.6.1.4.1.2312.8.1.1.248 NAME 'rhcsHmc-version' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) attributeTypes: ( - 1.3.6.1.4.1.2312.8.1.1.60 NAME 'rhcsVmware-type' + 1.3.6.1.4.1.2312.8.1.1.249 NAME 'rhcsCmd-prompt' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) attributeTypes: ( - 1.3.6.1.4.1.2312.8.1.1.61 NAME 'rhcsVmware-datacenter' + 1.3.6.1.4.1.2312.8.1.1.250 NAME 'rhcsInet4-only' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.251 NAME 'rhcsInet6-only' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.252 NAME 'rhcsIpport' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.55 NAME 'rhcsIdentity-file' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.253 NAME 'rhcsSnmp-version' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.254 NAME 'rhcsCommunity' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.255 NAME 'rhcsSnmp-auth-prot' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.256 NAME 'rhcsSnmp-sec-level' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.257 NAME 'rhcsSnmp-priv-prot' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.258 NAME 'rhcsSnmp-priv-passwd' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.259 NAME 'rhcsSnmp-priv-passwd-script' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.260 NAME 'rhcsUdpport' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE @@ -667,6 +751,54 @@ attributeTypes: ( SINGLE-VALUE ) attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.261 NAME 'rhcsCipher' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.262 NAME 'rhcsMethod' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.263 NAME 'rhcsDrac-version' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.264 NAME 'rhcsModule-name' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.54 NAME 'rhcsSwitch' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.265 NAME 'rhcsIo-fencing' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.56 NAME 'rhcsSsl' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.266 NAME 'rhcsRibcl' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( 1.3.6.1.4.1.2312.8.1.1.9 NAME 'rhcsAgent' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 @@ -1495,7 +1627,7 @@ objectClasses: ( objectClasses: ( 1.3.6.1.4.1.2312.8.1.2.5 NAME 'rhcsFencedevice' SUP top STRUCTURAL MUST ( rhcsAgent $ name ) - MAY ( rhcsTimeout $ rhcsUse-uuid $ rhcsDomain $ rhcsKey-file $ rhcsHash $ rhcsRetrans $ rhcsMulticast-ttl $ rhcsMulticast-address $ rhcsIp-family $ rhcsDebug $ rhcsVmware-datacenter $ rhcsVmware-type $ rhcsExec $ rhcsManaged $ rhcsPartition $ rhcsSsl $ rhcsIdentity-file $ rhcsSwitch $ rhcsVerbose $ rhcsSecure $ rhcsOption $ rhcsAction $ rhcsRpowerpath $ rhcsCserver $ rhcsServers $ rhcsSelf $ rhcsNodename $ rhcsLanplus $ rhcsAuth $ rhcsPasswd-script $ rhcsPasswd $ rhcsLogin $ rhcsIpaddr $ rhcsPort $ rhcsDevice ) + MAY ( rhcsRibcl $ rhcsSsl $ rhcsIo-fencing $ rhcsSwitch $ rhcsModule-name $ rhcsDrac-version $ rhcsMethod $ rhcsCipher $ rhcsTimeout $ rhcsUse-uuid $ rhcsDomain $ rhcsKey-file $ rhcsHash $ rhcsRetrans $ rhcsMulticast-ttl $ rhcsMulticast-address $ rhcsIp-family $ rhcsUdpport $ rhcsSnmp-priv-passwd-script $ rhcsSnmp-priv-passwd $ rhcsSnmp-priv-prot $ rhcsSnmp-sec-level $ rhcsSnmp-auth-prot $ rhcsCommunity $ rhcsSnmp-version $ rhcsIdentity-file $ rhcsIpport $ rhcsInet6-only $ rhcsInet4-only $ rhcsCmd-prompt $ rhcsHmc-version $ rhcsManaged $ rhcsPartition $ rhcsSeparator $ rhcsHelp $ rhcsVersion $ rhcsDebug $ rhcsVerbose $ rhcsVmware-datacenter $ rhcsSecure $ rhcsVmware-type $ rhcsExec $ rhcsAction $ rhcsOption $ rhcsRpowerpath $ rhcsCserver $ rhcsServers $ rhcsSelf $ rhcsNodename $ rhcsLanplus $ rhcsAuth $ rhcsPasswd-script $ rhcsPasswd $ rhcsLogin $ rhcsIpaddr $ rhcsPort $ rhcsDevice ) ) objectClasses: ( 1.3.6.1.4.1.2312.8.1.2.21 NAME 'rhcsRm' SUP top STRUCTURAL diff --git a/config/plugins/ldap/ldap-base.csv b/config/plugins/ldap/ldap-base.csv index 3f30038..83700a4 100644 --- a/config/plugins/ldap/ldap-base.csv +++ b/config/plugins/ldap/ldap-base.csv @@ -1,4 +1,4 @@ -# Max attribute value: 244 +# Max attribute value: 266 # Max object class value: 58 obj,rhcsCluster,cluster,1 obj,rhcsCman,cman,3 @@ -301,3 +301,25 @@ attr,rhcsUpgrading,upgrading,241 attr,rhcsDisallowed,disallowed,242 attr,rhcsIo-timeout,io_timeout,243 attr,rhcsMaster-wins,master_wins,244 +attr,rhcsVersion,version,245 +attr,rhcsHelp,help,246 +attr,rhcsSeparator,separator,247 +attr,rhcsHmc-version,hmc_version,248 +attr,rhcsCmd-prompt,cmd_prompt,249 +attr,rhcsInet4-only,inet4_only,250 +attr,rhcsInet6-only,inet6_only,251 +attr,rhcsIpport,ipport,252 +attr,rhcsSnmp-version,snmp_version,253 +attr,rhcsCommunity,community,254 +attr,rhcsSnmp-auth-prot,snmp_auth_prot,255 +attr,rhcsSnmp-sec-level,snmp_sec_level,256 +attr,rhcsSnmp-priv-prot,snmp_priv_prot,257 +attr,rhcsSnmp-priv-passwd,snmp_priv_passwd,258 +attr,rhcsSnmp-priv-passwd-script,snmp_priv_passwd_script,259 +attr,rhcsUdpport,udpport,260 +attr,rhcsCipher,cipher,261 +attr,rhcsMethod,method,262 +attr,rhcsDrac-version,drac_version,263 +attr,rhcsModule-name,module_name,264 +attr,rhcsIo-fencing,io_fencing,265 +attr,rhcsRibcl,ribcl,266 diff --git a/config/tools/xml/cluster.rng.in b/config/tools/xml/cluster.rng.in index fdf8aba..52a77ee 100644 --- a/config/tools/xml/cluster.rng.in +++ b/config/tools/xml/cluster.rng.in @@ -849,340 +849,1064 @@ To validate your cluster.conf against this schema, run:   -  +  <group> <optional> - <attribute name="action"/> + <attribute name="option"/>  </optional> - <optional>  - <attribute name="option"/> + <attribute name="action" rha:description="Fencing Action" /> + <attribute name="ipaddr" rha:description="IP Address or Hostname" /> + <attribute name="login" rha:description="Login Name" /> + <optional> + <attribute name="passwd" rha:description="Login password or passphrase" /> </optional> - <attribute name="ipaddr"/> - <attribute name="login"/> <optional> - <attribute name="passwd"/> + <attribute name="passwd_script" rha:description="Script to retrieve password" /> </optional> + <attribute name="port" rha:description="Physical plug number or name of virtual machine" /> <optional> - <attribute name="passwd_script"/> + <attribute name="exec" rha:description="Command to execute" /> </optional> <optional> - <attribute name="secure"/> + <attribute name="vmware_type" rha:description="Type of VMware to connect" /> </optional> <optional> - <attribute name="verbose"/> + <attribute name="secure" rha:description="SSH connection" /> + </optional> + <optional> + <attribute name="vmware_datacenter" rha:description="Show only machines in specified datacenter" /> + </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> </group> -  + +  <group> <optional> - <attribute name="action"/> + <attribute name="option"/>  </optional> - <optional>  - <attribute name="option"/> + <attribute name="action" rha:description="Fencing Action" /> + <attribute name="ipaddr" rha:description="IP Address or Hostname" /> + <attribute name="login" rha:description="Login Name" /> + <optional> + <attribute name="passwd" rha:description="Login password or passphrase" /> </optional> - <attribute name="ipaddr"/> - <attribute name="login"/> <optional> - <attribute name="passwd"/> + <attribute name="passwd_script" rha:description="Script to retrieve password" /> </optional> <optional> - <attribute name="passwd_script"/> + <attribute name="secure" rha:description="SSH connection" /> </optional> <optional> - <attribute name="secure"/> + <attribute name="partition" rha:description="Partition name" /> </optional> <optional> - <attribute name="switch"/> + <attribute name="managed" rha:description="Managed system name" /> </optional> <optional> - <attribute name="verbose"/> + <attribute name="hmc_version" rha:description="Force HMC version to use (3 or 4)" /> + </optional> + <optional> + <attribute name="cmd_prompt" rha:description="Force command prompt" /> + </optional> + <optional> + <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" /> + </optional> + <optional> + <attribute name="inet6_only" rha:description="Forces agent to use IPv6 addresses only" /> + </optional> + <optional> + <attribute name="ipport" rha:description="TCP port to use for connection with device" /> + </optional> + <optional> + <attribute name="verbose" rha:description="Verbose mode" /> + </optional> + <optional> + <attribute name="debug" rha:description="Write debug information to given file" /> + </optional> + <optional> + <attribute name="version" rha:description="Display version information and exit" /> + </optional> + <optional> + <attribute name="help" rha:description="Display help and exit" /> + </optional> + <optional> + <attribute name="separator" rha:description="Separator for CSV created by operation list" /> </optional> </group> +  <group> <optional> - <attribute name="action"/> + <attribute name="option"/>  </optional> - <optional>  - <attribute name="option"/> + <attribute name="action" rha:description="Fencing Action" /> + <attribute name="ipaddr" rha:description="IP Address or Hostname" /> + <attribute name="login" rha:description="Login Name" /> + <optional> + <attribute name="passwd" rha:description="Login password or passphrase" /> </optional> - <attribute name="ipaddr"/> - <attribute name="login"/> <optional> - <attribute name="passwd"/> + <attribute name="passwd_script" rha:description="Script to retrieve password" /> </optional> <optional> - <attribute name="passwd_script"/> + <attribute name="cmd_prompt" rha:description="Force command prompt" /> </optional> <optional> - <attribute name="secure"/> + <attribute name="secure" rha:description="SSH connection" /> </optional> + <attribute name="port" rha:description="Physical plug number or name of virtual machine" /> <optional> - <attribute name="identity_file"/> + <attribute name="identity_file" rha:description="Identity file for ssh" /> </optional> <optional> - <attribute name="verbose"/> + <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" /> + </optional> + <optional> + <attribute name="inet6_only" rha:description="Forces agent to use IPv6 addresses only" /> + </optional> + <optional> + <attribute name="ipport" rha:description="TCP port to use for connection with device" /> + </optional> + <optional> + <attribute name="verbose" rha:description="Verbose mode" /> + </optional> + <optional> + <attribute name="debug" rha:description="Write debug information to given file" /> + </optional> + <optional> + <attribute name="version" rha:description="Display version information and exit" /> + </optional> + <optional> + <attribute name="help" rha:description="Display help and exit" /> + </optional> + <optional> + <attribute name="separator" rha:description="Separator for CSV created by operation list" /> </optional> </group> -  + +  <group> <optional> - <attribute name="action"/> + <attribute name="option"/>  </optional> - <optional>  - <attribute name="option"/> + <attribute name="action" rha:description="Fencing Action" /> + <attribute name="ipaddr" rha:description="IP Address or Hostname" /> + <optional> + <attribute name="login" rha:description="Login Name" /> </optional> - <attribute name="ipaddr"/> - <attribute name="login"/> <optional> - <attribute name="passwd"/> + <attribute name="passwd" rha:description="Login password or passphrase" /> </optional> <optional> - <attribute name="passwd_script"/> + <attribute name="passwd_script" rha:description="Script to retrieve password" /> </optional> + <attribute name="port" rha:description="Physical plug number or name of virtual machine" /> <optional> - <attribute name="secure"/> + <attribute name="snmp_version" rha:description="Specifies SNMP version to use (1,2c,3)" /> </optional> <optional> - <attribute name="verbose"/> + <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> </group> -  + +  <group> <optional> - <attribute name="action"/> + <attribute name="option"/>  </optional> - <optional>  - <attribute name="option"/> + <attribute name="action" rha:description="Fencing Action" /> + <attribute name="ipaddr" rha:description="IP Address or Hostname" /> + <optional> + <attribute name="login" rha:description="Login Name" /> </optional> - <attribute name="ipaddr"/> <optional> - <attribute name="login"/> + <attribute name="passwd" rha:description="Login password or passphrase" /> </optional> <optional> - <attribute name="passwd"/> + <attribute name="passwd_script" rha:description="Script to retrieve password" /> </optional> + <attribute name="port" rha:description="Physical plug number or name of virtual machine" /> <optional> - <attribute name="passwd_script"/> + <attribute name="snmp_version" rha:description="Specifies SNMP version to use (1,2c,3)" /> </optional> <optional> - <attribute name="verbose"/> + <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> </group> -  + +  <group> <optional> - <attribute name="action"/> + <attribute name="option"/>  </optional> - <optional>  - <attribute name="option"/> + <attribute name="action" rha:description="Fencing Action" /> + <attribute name="ipaddr" rha:description="IP Address or Hostname" /> + <optional> + <attribute name="login" rha:description="Login Name" /> </optional> - <attribute name="ipaddr"/> - <attribute name="login"/> <optional> - <attribute name="passwd"/> + <attribute name="passwd" rha:description="Login password or passphrase" /> </optional> <optional> - <attribute name="passwd_script"/> + <attribute name="passwd_script" rha:description="Script to retrieve password" /> </optional> + <attribute name="port" rha:description="Physical plug number or name of virtual machine" /> <optional> - <attribute name="ssl"/> + <attribute name="verbose" rha:description="Verbose mode" /> </optional> <optional> - <attribute name="verbose"/> + <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> </group> +  <group> <optional> - <attribute name="action"/> + <attribute name="option"/>  </optional> - <optional>  - <attribute name="option"/> + <attribute name="action" rha:description="Fencing Action" /> + <attribute name="ipaddr" rha:description="IP Address or Hostname" /> + <attribute name="login" rha:description="Login Name" /> + <optional> + <attribute name="passwd" rha:description="Login password or passphrase" /> </optional> - <attribute name="ipaddr"/> - <attribute name="login"/> <optional> - <attribute name="passwd"/> + <attribute name="passwd_script" rha:description="Script to retrieve password" /> </optional> <optional> - <attribute name="passwd_script"/> + <attribute name="secure" rha:description="SSH connection" /> </optional> <optional> - <attribute name="secure"/> + <attribute name="identity_file" rha:description="Identity file for ssh" /> </optional> + <attribute name="port" rha:description="Physical plug number or name of virtual machine" /> <optional> - <attribute name="identity_file"/> + <attribute name="cmd_prompt" rha:description="Force command prompt" /> </optional> <optional> - <attribute name="verbose"/> + <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" /> + </optional> + <optional> + <attribute name="inet6_only" rha:description="Forces agent to use IPv6 addresses only" /> + </optional> + <optional> + <attribute name="ipport" rha:description="TCP port to use for connection with device" /> + </optional> + <optional> + <attribute name="verbose" rha:description="Verbose mode" /> + </optional> + <optional> + <attribute name="debug" rha:description="Write debug information to given file" /> + </optional> + <optional> + <attribute name="version" rha:description="Display version information and exit" /> + </optional> + <optional> + <attribute name="help" rha:description="Display help and exit" /> + </optional> + <optional> + <attribute name="separator" rha:description="Separator for CSV created by operation list" /> </optional> </group> -  + +  <group> <optional> - <attribute name="action"/> + <attribute name="option"/>  </optional> - <optional>  - <attribute name="option"/> + <optional> + <attribute name="debug" rha:description="Specify (CCS) / increment (command line) debug level" /> </optional> - <attribute name="ipaddr"/> - <attribute name="login"/> <optional> - <attribute name="passwd"/> + <attribute name="ip_family" rha:description="IP Family ([auto], ipv4, ipv6)" /> </optional> <optional> - <attribute name="passwd_script"/> + <attribute name="multicast_address" rha:description="Multicast address (default=225.0.0.12 / ff02::3:1)" /> </optional> <optional> - <attribute name="secure"/> + <attribute name="port" rha:description="IP port (default=1229)" /> </optional> <optional> - <attribute name="partition"/> + <attribute name="multicast_ttl" rha:description="Multicast time-to-live (in hops; default=2)" /> </optional> <optional> - <attribute name="managed"/> + <attribute name="retrans" rha:description="Multicast retransmit time (in 1/10sec; default=20)" /> </optional> <optional> - <attribute name="verbose"/> + <attribute name="auth" rha:description="Authentication (none, sha1, [sha256], sha512)" /> + </optional> + <optional> + <attribute name="hash" rha:description="Packet hash strength (none, sha1, [sha256], sha512)" /> + </optional> + <optional> + <attribute name="key_file" rha:description="Shared key file (default=/etc/cluster/fence_xvm.key)" /> + </optional> + <optional> + <attribute name="domain" rha:description="Xen host (domain name) to fence" /> + </optional> + <optional> + <attribute name="use_uuid" rha:description="Treat 'domain' as UUID instead of domain name" /> + </optional> + <optional> + <attribute name="option" rha:description="Fencing operation (null, off, [reboot])" /> + </optional> + <optional> + <attribute name="timeout" rha:description="Fencing timeout (in seconds; default=30)" /> </optional> </group> -  + +  <group> <optional> - <attribute name="action"/> + <attribute name="option"/>  </optional> - <optional>  - <attribute name="option"/> + <optional> + <attribute name="auth" rha:description="IPMI Lan Auth type (md5, password, or none)" /> </optional> - <attribute name="ipaddr"/> - <attribute name="login"/> <optional> - <attribute name="passwd"/> + <attribute name="ipaddr" rha:description="IPMI Lan IP to talk to" /> </optional> <optional> - <attribute name="passwd_script"/> + <attribute name="passwd" rha:description="Password (if required) to control power on IPMI device" /> </optional> <optional> - <attribute name="secure"/> + <attribute name="passwd_script" rha:description="Script to retrieve password (if required)" /> </optional> <optional> - <attribute name="identity_file"/> + <attribute name="lanplus" rha:description="Use Lanplus" /> </optional> <optional> - <attribute name="verbose"/> + <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" /> + </optional> + <optional> + <attribute name="timeout" rha:description="Timeout (sec) for IPMI operation" /> + </optional> + <optional> + <attribute name="cipher" rha:description="Ciphersuite to use (same as ipmitool -C parameter)" /> + </optional> + <optional> + <attribute name="method" rha:description="Method to fence (onoff or cycle)" /> + </optional> + <optional> + <attribute name="verbose" rha:description="Verbose mode" /> </optional> </group> -  + +  <group> <optional> - <attribute name="action"/> + <attribute name="option"/>  </optional> - <optional>  - <attribute name="option"/> + <attribute name="action" rha:description="Fencing Action" /> + <attribute name="ipaddr" rha:description="IP Address or Hostname" /> + <attribute name="login" rha:description="Login Name" /> + <optional> + <attribute name="passwd" rha:description="Login password or passphrase" /> </optional> - <attribute name="ipaddr"/> - <attribute name="login"/> <optional> - <attribute name="passwd"/> + <attribute name="passwd_script" rha:description="Script to retrieve password" /> </optional> <optional> - <attribute name="passwd_script"/> + <attribute name="cmd_prompt" rha:description="Force command prompt" /> </optional> <optional> - <attribute name="exec"/> + <attribute name="secure" rha:description="SSH connection" /> </optional> <optional> - <attribute name="vmware_type"/> + <attribute name="ipport" rha:description="TCP port to use for connection with device" /> </optional> <optional> - <attribute name="secure"/> + <attribute name="verbose" rha:description="Verbose mode" /> </optional> <optional> - <attribute name="vmware_datacenter"/> + <attribute name="debug" rha:description="Write debug information to given file" /> </optional> <optional> - <attribute name="verbose"/> + <attribute name="version" rha:description="Display version information and exit" /> + </optional> + <optional> + <attribute name="help" rha:description="Display help and exit" /> </optional> </group> + +  + <group> + <optional> + <attribute name="option"/>  + </optional> + <attribute name="action" rha:description="Fencing Action" /> + <attribute name="ipaddr" rha:description="IP Address or Hostname" /> + <attribute name="login" rha:description="Login Name" /> + <optional> + <attribute name="passwd" rha:description="Login password or passphrase" /> + </optional> + <optional> + <attribute name="passwd_script" rha:description="Script to retrieve password" /> + </optional> + <optional> + <attribute name="secure" rha:description="SSH connection" /> + </optional> + <optional> + <attribute name="identity_file" rha:description="Identity file for ssh" /> + </optional> + <attribute name="port" rha:description="Physical plug number or name of virtual machine" /> + <optional> + <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" /> + </optional> + <optional> + <attribute name="inet6_only" rha:description="Forces agent to use IPv6 addresses only" /> + </optional> + <optional> + <attribute name="ipport" rha:description="TCP port to use for connection with device" /> + </optional> + <optional> + <attribute name="verbose" rha:description="Verbose mode" /> + </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> + </group> + +  <group> <optional> - <attribute name="action"/> + <attribute name="option"/>  </optional> - <optional>  - <attribute name="option"/> + <attribute name="action" rha:description="Fencing Action" /> + <attribute name="ipaddr" rha:description="IP Address or Hostname" /> + <optional> + <attribute name="login" rha:description="Login Name" /> </optional> - <attribute name="ipaddr"/> <optional> - <attribute name="login"/> + <attribute name="passwd" rha:description="Login password or passphrase" /> </optional> <optional> - <attribute name="passwd"/> + <attribute name="passwd_script" rha:description="Script to retrieve password" /> </optional> <optional> - <attribute name="passwd_script"/> + <attribute name="cmd_prompt" rha:description="Force command prompt" /> </optional> <optional> - <attribute name="secure"/> + <attribute name="secure" rha:description="SSH connection" /> </optional> + <attribute name="port" rha:description="Physical plug number or name of virtual machine" /> <optional> - <attribute name="verbose"/> + <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" /> + </optional> + <optional> + <attribute name="inet6_only" rha:description="Forces agent to use IPv6 addresses only" /> + </optional> + <optional> + <attribute name="ipport" rha:description="TCP port to use for connection with device" /> + </optional> + <optional> + <attribute name="verbose" rha:description="Verbose mode" /> + </optional> + <optional> + <attribute name="debug" rha:description="Write debug information to given file" /> + </optional> + <optional> + <attribute name="version" rha:description="Display version information and exit" /> + </optional> + <optional> + <attribute name="help" rha:description="Display help and exit" /> + </optional> + <optional> + <attribute name="separator" rha:description="Separator for CSV created by operation list" /> </optional> </group> -  + +  <group> <optional> - <attribute name="debug"/> + <attribute name="option"/>  </optional> + <attribute name="action" rha:description="Fencing Action" /> + <attribute name="ipaddr" rha:description="IP Address or Hostname" /> + <attribute name="login" rha:description="Login Name" /> <optional> - <attribute name="ip_family"/> + <attribute name="passwd" rha:description="Login password or passphrase" /> </optional> <optional> - <attribute name="multicast_address"/> + <attribute name="passwd_script" rha:description="Script to retrieve password" /> </optional> <optional> - <attribute name="port"/> + <attribute name="cmd_prompt" rha:description="Force command prompt" /> </optional> <optional> - <attribute name="multicast_ttl"/> + <attribute name="secure" rha:description="SSH connection" /> </optional> <optional> - <attribute name="retrans"/> + <attribute name="drac_version" rha:description="Force DRAC version to use" /> </optional> <optional> - <attribute name="auth"/> + <attribute name="module_name" rha:description="DRAC/MC module name" /> </optional> <optional> - <attribute name="hash"/> + <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" /> </optional> <optional> - <attribute name="key_file"/> + <attribute name="inet6_only" rha:description="Forces agent to use IPv6 addresses only" /> </optional> <optional> - <attribute name="domain"/> + <attribute name="ipport" rha:description="TCP port to use for connection with device" /> </optional> <optional> - <attribute name="use_uuid"/> + <attribute name="verbose" rha:description="Verbose mode" /> </optional> <optional> - <attribute name="option"/> + <attribute name="debug" rha:description="Write debug information to given file" /> </optional> <optional> - <attribute name="timeout"/> + <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> + </group> + + +  + <group> + <optional> + <attribute name="option"/>  + </optional> + <attribute name="action" rha:description="Fencing Action" /> + <attribute name="ipaddr" rha:description="IP Address or Hostname" /> + <attribute name="login" rha:description="Login Name" /> + <optional> + <attribute name="passwd" rha:description="Login password or passphrase" /> + </optional> + <optional> + <attribute name="passwd_script" rha:description="Script to retrieve password" /> + </optional> + <optional> + <attribute name="secure" rha:description="SSH connection" /> + </optional> + <optional> + <attribute name="cmd_prompt" rha:description="Force command prompt" /> + </optional> + <optional> + <attribute name="ipport" rha:description="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> </group> + + +  + <group> + <optional> + <attribute name="option"/>  + </optional> + <attribute name="action" rha:description="Fencing Action" /> + <attribute name="ipaddr" rha:description="IP Address or Hostname" /> + <attribute name="login" rha:description="Login Name" /> + <optional> + <attribute name="passwd" rha:description="Login password or passphrase" /> + </optional> + <optional> + <attribute name="passwd_script" rha:description="Script to retrieve password" /> + </optional> + <optional> + <attribute name="secure" rha:description="SSH connection" /> + </optional> + <attribute name="port" rha:description="Physical plug number or name of virtual machine" /> + <optional> + <attribute name="switch" rha:description="Physical switch number on device" /> + </optional> + <optional> + <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" /> + </optional> + <optional> + <attribute name="inet6_only" rha:description="Forces agent to use IPv6 addresses only" /> + </optional> + <optional> + <attribute name="ipport" rha:description="TCP port to use for connection with device" /> + </optional> + <optional> + <attribute name="verbose" rha:description="Verbose mode" /> + </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> + </group> + + +  + <group> + <optional> + <attribute name="option"/>  + </optional> + <attribute name="action" rha:description="Fencing Action" /> + <attribute name="ipaddr" rha:description="IP Address or Hostname" /> + <attribute name="login" rha:description="Login Name" /> + <optional> + <attribute name="passwd" rha:description="Login password or passphrase" /> + </optional> + <optional> + <attribute name="passwd_script" rha:description="Script to retrieve password" /> + </optional> + <optional> + <attribute name="secure" rha:description="SSH connection" /> + </optional> + <optional> + <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" /> + </optional> + <optional> + <attribute name="inet6_only" rha:description="Forces agent to use IPv6 addresses only" /> + </optional> + <optional> + <attribute name="ipport" rha:description="TCP port to use for connection with device" /> + </optional> + <optional> + <attribute name="verbose" rha:description="Verbose mode" /> + </optional> + <optional> + <attribute name="debug" rha:description="Write debug information to given file" /> + </optional> + <optional> + <attribute name="version" rha:description="Display version information and exit" /> + </optional> + <optional> + <attribute name="help" rha:description="Display help and exit" /> + </optional> + </group> + + +  + <group> + <optional> + <attribute name="option"/>  + </optional> + <attribute name="action" rha:description="Fencing Action" /> + <attribute name="ipaddr" rha:description="IP Address or Hostname" /> + <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> + <attribute name="port" rha:description="Physical plug number or name of virtual machine" /> + <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> + </group> + + +  + <group> + <optional> + <attribute name="option"/>  + </optional> + <attribute name="io_fencing" rha:description="Fencing Action" /> + <attribute name="ipaddr" rha:description="IP Address or Hostname" /> + <attribute name="login" rha:description="Login Name" /> + <optional> + <attribute name="passwd" rha:description="Login password or passphrase" /> + </optional> + <optional> + <attribute name="passwd_script" rha:description="Script to retrieve password" /> + </optional> + <optional> + <attribute name="cmd_prompt" rha:description="Force command prompt" /> + </optional> + <attribute name="port" rha:description="Physical plug number or name of virtual machine" /> + <optional> + <attribute name="ipport" rha:description="TCP port to use for connection with device" /> + </optional> + <optional> + <attribute name="verbose" rha:description="Verbose mode" /> + </optional> + <optional> + <attribute name="debug" rha:description="Write debug information to given file" /> + </optional> + <optional> + <attribute name="version" rha:description="Display version information and exit" /> + </optional> + <optional> + <attribute name="help" rha:description="Display help and exit" /> + </optional> + <optional> + <attribute name="separator" rha:description="Separator for CSV created by operation list" /> + </optional> + </group> + + +  + <group> + <optional> + <attribute name="option"/>  + </optional> + <attribute name="action" rha:description="Fencing Action" /> + <attribute name="ipaddr" rha:description="IP Address or Hostname" /> + <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> + <attribute name="port" rha:description="Physical plug number or name of virtual machine" /> + <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> + </group> + + +  + <group> + <optional> + <attribute name="option"/>  + </optional> + <attribute name="action" rha:description="Fencing Action" /> + <attribute name="ipaddr" rha:description="IP Address or Hostname" /> + <attribute name="login" rha:description="Login Name" /> + <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="ribcl" rha:description="Force ribcl version to use" /> + </optional> + <optional> + <attribute name="inet4_only" rha:description="Forces agent to use IPv4 addresses only" /> + </optional> + <optional> + <attribute name="inet6_only" rha:description="Forces agent to use IPv6 addresses only" /> + </optional> + <optional> + <attribute name="ipport" rha:description="TCP port to use for connection with device" /> + </optional> + <optional> + <attribute name="verbose" rha:description="Verbose mode" /> + </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> + </group> + + +  + <group> + <optional> + <attribute name="option"/>  + </optional> + <attribute name="action" rha:description="Fencing Action" /> + <attribute name="ipaddr" rha:description="IP Address or Hostname" /> + <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> + <attribute name="port" rha:description="Physical plug number or name of virtual machine" /> + <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> + </group> +  <group>

14 years, 5 months

1
0
0 / 0

cluster: STABLE3 - fence-agents: Tweak translator output

by Lon Hohberger

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=... Commit: 0cb1e06264c37d5bf8fede90a6a93a1bc1927357 Parent: a48bfaa5fc0d91b9fc97d490c32d264702a66779 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Fri Nov 13 18:21:39 2009 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Fri Nov 13 18:21:39 2009 -0500 fence-agents: Tweak translator output Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- fence/agents/lib/fence2rng.xsl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fence/agents/lib/fence2rng.xsl b/fence/agents/lib/fence2rng.xsl index 56f5859..e0c82bc 100644 --- a/fence/agents/lib/fence2rng.xsl +++ b/fence/agents/lib/fence2rng.xsl @@ -9,7 +9,7 @@  <group> <optional> - <attribute name="option">  + <attribute name="option"/>  </optional><xsl:for-each select="parameters/parameter"> <xsl:choose><xsl:when test="@required = 1 or @primary = 1"> <attribute name="<xsl:value-of select="@name"/>" rha:description="<xsl:value-of select="normalize-space(shortdesc)"/>" /></xsl:when><xsl:otherwise>

14 years, 5 months

1
0
0 / 0

cluster: STABLE3 - fence-agents: Fix xvm metadata handling

by Lon Hohberger

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=... Commit: a48bfaa5fc0d91b9fc97d490c32d264702a66779 Parent: 2e16b0c329c418cc7070874bfd620795d2b22ee3 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Fri Nov 13 18:19:01 2009 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Fri Nov 13 18:19:01 2009 -0500 fence-agents: Fix xvm metadata handling Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- fence/agents/xvm/options.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fence/agents/xvm/options.c b/fence/agents/xvm/options.c index 0e5d394..78ff013 100644 --- a/fence/agents/xvm/options.c +++ b/fence/agents/xvm/options.c @@ -357,12 +357,12 @@ static struct arg_info _arg_info[] = { { 'H', "-H <domain>", "domain", 1, "string", NULL, - "Xen host (domain name) to fence", + "Virtual machine (domain name) to fence", assign_domain }, { 'u', "-u", "use_uuid", 0, "string", NULL, - "Treat <domain> as UUID instead of domain name", + "Treat 'domain' as UUID instead of domain name", assign_uuid_lookup }, { 't', "-t <timeout>", "timeout",

14 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

cluster-commits November 2009