cluster: STABLE31 - cman preconfig: fix segfault if we cannot determine cluster name
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: e6e7f1837b53d8f2095392afc30aca411307730c
Parent: ab50640bc9093597e237efe6b728f13542b1ec4f
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Mon Mar 28 16:12:05 2011 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Mon Mar 28 16:12:05 2011 +0200
cman preconfig: fix segfault if we cannot determine cluster name
This takes a lot of effort to reproduce, but it can still happen.
Resolves: rhbz#651375
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
cman/daemon/cman-preconfig.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c
index d64da25..a890fb3 100644
--- a/cman/daemon/cman-preconfig.c
+++ b/cman/daemon/cman-preconfig.c
@@ -1275,6 +1275,11 @@ static int get_cman_globals(struct objdb_iface_ver0 *objdb)
objdb_get_string(objdb, cluster_parent_handle, "name", &cluster_name);
+ if (!cluster_name) {
+ sprintf(error_reason, "Unable to determine cluster name.\n");
+ return -1;
+ }
+
/* Get the <cman> bits that override <totem> bits */
objdb->object_find_create(cluster_parent_handle, "cman", strlen("cman"), &find_handle);
if (objdb->object_find_next(find_handle, &object_handle) == 0) {
13 years
cluster: RHEL56 - ccs: Allow ccs_tool to use alternate base ports
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 2f81d99e85673db1989b17f9b4f5a3f37a405775
Parent: 98f3a54ca8b1bf4536fb3caac62e5e15cfda2675
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Wed Feb 9 14:48:53 2011 -0500
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Mon Mar 28 09:45:34 2011 -0400
ccs: Allow ccs_tool to use alternate base ports
Resolves: rhbz#677814
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
ccs/ccs_tool/ccs_tool.c | 2 +-
ccs/ccs_tool/update.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++-
ccs/ccs_tool/update.h | 1 +
3 files changed, 65 insertions(+), 2 deletions(-)
diff --git a/ccs/ccs_tool/ccs_tool.c b/ccs/ccs_tool/ccs_tool.c
index dc54146..5fcd667 100644
--- a/ccs/ccs_tool/ccs_tool.c
+++ b/ccs/ccs_tool/ccs_tool.c
@@ -36,7 +36,7 @@ int main(int argc, char *argv[])
"Try 'ccs_tool help' for help.\n");
exit(EXIT_FAILURE);
}
- if(update(argv[optind+1])){
+ if(update2(argc-1, argv+1)){
fprintf(stderr, "\nFailed to update config file.\n");
exit(EXIT_FAILURE);
}
diff --git a/ccs/ccs_tool/update.c b/ccs/ccs_tool/update.c
index 1defdaf..3af779b 100644
--- a/ccs/ccs_tool/update.c
+++ b/ccs/ccs_tool/update.c
@@ -113,11 +113,70 @@ fail:
}
-int update(char *location)
+static int parse_args(int argc, char **argv, char **loc)
+{
+ int c, error, ret;
+
+ while ((c = getopt(argc, argv, "P:")) != EOF) {
+ switch(c) {
+ case 'P':
+ if(optarg[1] != ':'){
+ fprintf(stderr, "Bad argument to '-P' option.\n"
+ "Try '-h' for help.\n");
+ error = -EINVAL;
+ goto fail;
+ }
+ switch(optarg[0]){
+ case 'b': /* backend port number */
+ /* Not used by ccs_tool */
+ break;
+ case 'c': /* cluster base port number */
+ ret = atoi(optarg+2);
+ if(ret < 1024){
+ fprintf(stderr, "Bad cluster base port number.\n");
+ error = -EINVAL;
+ goto fail;
+ }
+ cluster_base_port = ret;
+ printf("Set cluster base port to %d\n", cluster_base_port);
+ break;
+ case 'f': /* frontend port number */
+ /* Not used by ccs_tool */
+ break;
+ }
+ break;
+ default:
+ goto fail;
+ }
+ }
+
+ *loc = argv[optind];
+
+ return 0;
+fail:
+ return error;
+}
+
+int update(const char *location)
+{
+ char *args[3];
+ char **argv;
+
+ args[0] = "update";
+ args[1] = location;
+ args[2] = NULL;
+
+ argv = args;
+
+ return update2(2, argv);
+}
+
+int update2(int argc, char **argv)
{
int error = 0;
int i, fd;
int cluster_fd = -1;
+ char *location = NULL;
char true_location[256];
xmlDocPtr doc = NULL;
xmlChar *mem_doc;
@@ -132,6 +191,9 @@ int update(char *location)
struct timeval tv;
+ if (parse_args(argc, argv, &location))
+ return -1;
+
if (location[0] != '/') {
memset(true_location, 0, 256);
if (!getcwd(true_location, 256)) {
diff --git a/ccs/ccs_tool/update.h b/ccs/ccs_tool/update.h
index 19fd7cb..f706963 100644
--- a/ccs/ccs_tool/update.h
+++ b/ccs/ccs_tool/update.h
@@ -14,5 +14,6 @@
#define __UPDATE_DOT_H__
int update(char *location);
+int update2(int argc, char **argv);
#endif /* __UPDATE_DOT_H__ */
13 years
cluster: STABLE31 - cman_tool: fix typo in man page
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: ab50640bc9093597e237efe6b728f13542b1ec4f
Parent: 6444265805aee93eb4aa41a530ea258d62f89936
Author: Masatake YAMATO <yamato(a)redhat.com>
AuthorDate: Mon Mar 28 14:53:00 2011 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Mon Mar 28 14:53:00 2011 +0200
cman_tool: fix typo in man page
Resolves: rhbz#672792
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
cman/man/cman_tool.8 | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cman/man/cman_tool.8 b/cman/man/cman_tool.8
index cf11a24..a5b9f23 100644
--- a/cman/man/cman_tool.8
+++ b/cman/man/cman_tool.8
@@ -326,7 +326,7 @@ include: id, name, type, and addr.
.br
.SH "DEBUG" OPTIONS
.TP
-.I -d <value>
+.I -d<value>
The value is a bitmask of
.br
2 Barriers
13 years
cluster: STABLE31 - cman: do not add mcast address configuration to objdb when udpu is in use
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 6444265805aee93eb4aa41a530ea258d62f89936
Parent: e7d91758422f354a3488db5f9d375484b4be4535
Author: Vladislav Bogdanov <bubble(a)hoster-ok.com>
AuthorDate: Mon Mar 28 12:52:29 2011 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Mon Mar 28 12:53:19 2011 +0200
cman: do not add mcast address configuration to objdb when udpu is in use
Resolves: rhbz#690168
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
cman/daemon/cman-preconfig.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c
index 0b3e7fd..d64da25 100644
--- a/cman/daemon/cman-preconfig.c
+++ b/cman/daemon/cman-preconfig.c
@@ -343,8 +343,6 @@ static int add_ifaddr(struct objdb_iface_ver0 *objdb, char *mcast, char *ifaddr,
mcast, strlen(mcast)+1, OBJDB_VALUETYPE_STRING);
break;
case TX_MECH_UDPU:
- objdb->object_key_create_typed(interface_object_handle, "mcastaddr",
- mcast, strlen(mcast)+1, OBJDB_VALUETYPE_STRING);
add_udpu_members(objdb, interface_object_handle);
break;
}
13 years
cluster: STABLE31 - config: add more totem options to relax ng schema for config validation
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: e7d91758422f354a3488db5f9d375484b4be4535
Parent: 70df7a300dac3e598fba0d5585bae3a2f8bead23
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Mon Mar 28 12:46:03 2011 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Mon Mar 28 12:46:03 2011 +0200
config: add more totem options to relax ng schema for config validation
Original patch by Vladislav Bogdanov <bubble(a)hoster-ok.com>
Resolves: rhbz#689123
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
config/tools/xml/cluster.rng.in | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/config/tools/xml/cluster.rng.in b/config/tools/xml/cluster.rng.in
index c873cae..8ba6df6 100644
--- a/config/tools/xml/cluster.rng.in
+++ b/config/tools/xml/cluster.rng.in
@@ -197,6 +197,36 @@ To validate your cluster.conf against this schema, run:
<attribute name="fail_recv_const" />
</optional>
<optional>
+ <attribute name="seqno_unchanged_const"
+ rha:description="Specifies how many rotations of the token without
+ any multicast traffic should occur before the merge detection timeout
+ is started." rha:default="30" rha:sample="5000"/>
+ </optional>
+ <optional>
+ <attribute name="netmtu"
+ rha:description="Specifies the network maximum transmit unit. To set
+ this value beyond 1500, the regular frame MTU, requires ethernet
+ devices that support large, or also called jumbo, frames. If any
+ device in the network does not support large frames, the protocol will
+ not operate properly. The hosts must also have their mtu size set
+ from 1500 to whatever frame size is specified here."
+ rha:default="1500" rha:sample="9174"/>
+ </optional>
+ <optional>
+ <attribute name="window_size"
+ rha:description="Specifies the maximum number of messages that may
+ be sent on one token rotation. window_size should be no larger then
+ 256000 / netmtu to avoid overflow of the kernel receive buffers."
+ rha:default="50" rha:sample="300"/>
+ </optional>
+ <optional>
+ <attribute name="max_messages"
+ rha:description="Specifies the maximum number of messages that may
+ be sent by one processor on receipt of the token. This parameter is
+ limited to 256000 / netmtu to prevent overflow of the kernel
+ transmit buffers" rha:default="17" rha:sample="25"/>
+ </optional>
+ <optional>
<attribute name="token_retransmits_before_loss_const"
rha:description="This value identifies how many token retransmits
should be attempted before forming a new configuration. If
13 years
cluster: RHEL57 - rgmanager: Fix problems in generated XML config file for tomcat5
by Marek Grác
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 56ac82f2ed4babb8940305411591234698ca212c
Parent: 97d6e7595022a3bd9075740c879c75ddb8161362
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Mon Mar 28 12:22:24 2011 +0200
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Mon Mar 28 12:22:24 2011 +0200
rgmanager: Fix problems in generated XML config file for tomcat5
Add support for XML files to resource agents.
Resolves: rhbz#637802
---
rgmanager/src/resources/tomcat-5.sh | 4 ++--
rgmanager/src/resources/utils/config-utils.sh | 23 ++++++++++++++++++++++-
2 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/rgmanager/src/resources/tomcat-5.sh b/rgmanager/src/resources/tomcat-5.sh
index 52d6f39..2d6215f 100755
--- a/rgmanager/src/resources/tomcat-5.sh
+++ b/rgmanager/src/resources/tomcat-5.sh
@@ -146,10 +146,10 @@ generate_config_file()
clog_generate_config $CLOG_INIT "$original_file" "$generated_file"
-# generate_configTemplate "$generated_file" "$original_file"
+ generate_configTemplateXML "$generated_file" "$original_file"
$(dirname $0)/utils/tomcat-parse-config.pl $ip_addresses < "$original_file" >> "$generated_file"
- sha1_addToFile "$generated_file"
+ sha1_addToFileXML "$generated_file"
clog_generate_config $CLOG_SUCCEED "$original_file" "$generated_file"
return 0;
diff --git a/rgmanager/src/resources/utils/config-utils.sh b/rgmanager/src/resources/utils/config-utils.sh
old mode 100644
new mode 100755
index c54b266..d339479
--- a/rgmanager/src/resources/utils/config-utils.sh
+++ b/rgmanager/src/resources/utils/config-utils.sh
@@ -40,12 +40,33 @@ generate_configTemplate()
EOT
}
+generate_configTemplateXML()
+{
+ cat > "$1" << EOT
+<!--
+ "$1" was created from the "$2"
+
+ This template configuration was automatically generated, and will be
+ automatically regenerated if removed. Once this file has been altered,
+ automatic re-generation will stop. Remember to copy this file to all
+ other cluster members after making changes, or your service will not
+ operate correctly.
+-->
+EOT
+}
+
sha1_addToFile()
{
declare sha1line="# rgmanager-sha1 $(sha1sum "$1")"
echo $sha1line >> "$1"
}
+sha1_addToFileXML()
+{
+ declare sha1line="<!--# rgmanager-sha1 $(sha1sum "$1")-->"
+ echo $sha1line >> "$1"
+}
+
sha1_verify()
{
declare sha1_new sha1_old
@@ -54,7 +75,7 @@ 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_old=`tail -n 1 "$oldFile" | sed 's/^\(<!--\)\?# rgmanager-sha1 \(.*\)$/\2/' | sed 's/^\([a-z0-9]\+\) .*$/\1/'`
if [ $sha1_new = $sha1_old ]; then
ocf_log debug "Checking: SHA1 checksum > succeed"
13 years
cluster: STABLE31 - cman init: add config option to disable _controld daemons startup
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 70df7a300dac3e598fba0d5585bae3a2f8bead23
Parent: e5dd95786c6850866f0ffa15fe9fe564cbd9f765
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Mon Mar 28 11:46:27 2011 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Mon Mar 28 11:46:27 2011 +0200
cman init: add config option to disable _controld daemons startup
In some pacemaker clusters it is not desirable to lunch _controld daemons
from cman init, but allow pacemaker to handle them as resources.
this patch adds CMAN_DAEMONS_START startup option to handle this specific
case.
Original patch by Vladislav Bogdanov <bubble(a)hoster-ok.com>
Resolves: rhbz#690169
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
cman/init.d/cman.in | 27 +++++++++++++++++++++++++--
cman/init.d/cman.init.defaults.in | 8 ++++++++
2 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index 12f428f..0fcf52a 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -105,6 +105,14 @@ fi
# no (default) | cman will not start sshd
[ -z "$CMAN_SSHD_START" ] && CMAN_SSHD_START=no
+# CMAN_DAEMONS_START -- Set to "no" to disable {dlm,gfs,ocfs2}-controld daemons
+# execution from within cman init script
+# (Can be useful for some pacemaker-based setups).
+# values:
+# no | cman init will NOT start the daemons
+# empty or any other value (default) | cman init will start the daemons
+#CMAN_DAEMONS_START=
+
# FENCE_JOIN_TIMEOUT -- seconds to wait for fence domain join to
# complete. If the join hasn't completed in this time, fence_tool join
# exits with an error, and this script exits with an error. To wait
@@ -297,8 +305,22 @@ sshd_enabled()
return 1
}
+control_daemons_enabled()
+{
+ [ "$CMAN_DAEMONS_START" = "no" ] && return 1
+ return 0
+}
+
+dlm_controld_enabled()
+{
+ control_daemons_enabled
+ return $?
+}
+
gfs_controld_enabled()
{
+ ! control_daemons_enabled && return 1
+
if [ -f @INITDDIR@/gfs2-cluster ] && ! chkconfig2 gfs2-cluster; then
return 0
fi
@@ -415,6 +437,7 @@ groupd_enabled()
ocfs2_enabled()
{
+ ! control_daemons_enabled && return 1
ocfs2_cluster="$(cat /sys/fs/ocfs2/cluster_stack 2>/dev/null || true)"
[ "$ocfs2_cluster" != cman ] && return 1
return 0
@@ -782,7 +805,7 @@ start()
"Starting fenced"
runwrap start_dlm_controld \
- none \
+ dlm_controld_enabled \
"Starting dlm_controld"
gfs_controld_enabled && cd @INITDDIR@ && ./gfs2-cluster start
@@ -821,7 +844,7 @@ stop()
gfs_controld_enabled && cd @INITDDIR@ && ./gfs2-cluster stop
runwrap stop_dlm_controld \
- none \
+ dlm_controld_enabled \
"Stopping dlm_controld"
runwrap stop_fenced \
diff --git a/cman/init.d/cman.init.defaults.in b/cman/init.d/cman.init.defaults.in
index ac21c97..04b3b5b 100644
--- a/cman/init.d/cman.init.defaults.in
+++ b/cman/init.d/cman.init.defaults.in
@@ -31,6 +31,14 @@
# no (default) | cman will not start sshd
#CMAN_SSHD_START=no
+# CMAN_DAEMONS_START -- Set to "no" to disable {dlm,gfs,ocfs2}-controld daemons
+# execution from within cman init script
+# (Can be useful for some pacemaker-based setups).
+# values:
+# no | cman init will NOT start the daemons
+# empty or any other value (default) | cman init will start the daemons
+#CMAN_DAEMONS_START=
+
# FENCE_JOIN_TIMEOUT -- seconds to wait for fence domain join to
# complete. If the join hasn't completed in this time, fence_tool join
# exits with an error, and this script exits with an error. To wait
13 years
cluster: RHEL6 - fence_cisco_ucs: Fix for support for sub-organization
by Marek Grác
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 3ca792d705ca4c52a7224c183eaa84b38682557f
Parent: 4f9c0c57af4f9eb2fa6ac463dafd351a6c657998
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Fri Mar 25 11:00:35 2011 +0100
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Fri Mar 25 11:05:12 2011 +0100
fence_cisco_ucs: Fix for support for sub-organization
Resolves: rhbz#678094
---
fence/agents/cisco_ucs/fence_cisco_ucs.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fence/agents/cisco_ucs/fence_cisco_ucs.py b/fence/agents/cisco_ucs/fence_cisco_ucs.py
index 87c4bd2..a41349a 100755
--- a/fence/agents/cisco_ucs/fence_cisco_ucs.py
+++ b/fence/agents/cisco_ucs/fence_cisco_ucs.py
@@ -41,7 +41,7 @@ def set_power_status(conn, options):
}[options["-o"]]
try:
- res = send_command(options, "<configConfMos cookie=\"" + options["cookie"] + "\" inHierarchical=\"no\"><inConfigs><pair key=\"org-root/ls-" + options["-n"] + "/power\"><lsPower dn=\"org-root/ls-" + options["-n"] + "/power\" state=\"" + action + "\" status=\"modified\" /></pair></inConfigs></configConfMos>")
+ res = send_command(options, "<configConfMos cookie=\"" + options["cookie"] + "\" inHierarchical=\"no\"><inConfigs><pair key=\"org-root" + options["-s"] + "/ls-" + options["-n"] + "/power\"><lsPower dn=\"org-root/ls-" + options["-n"] + "/power\" state=\"" + action + "\" status=\"modified\" /></pair></inConfigs></configConfMos>")
except pycurl.error, e:
sys.stderr.write(e[1] + "\n")
fail(EC_TIMED_OUT)
13 years
cluster: RHEL57 - fence_cisco_ucs: Fix for support for sub-organization
by Marek Grác
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 97d6e7595022a3bd9075740c879c75ddb8161362
Parent: 0b661eb2e92c1f3c7cb60fec83c69d21c00a0414
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Fri Mar 25 11:00:35 2011 +0100
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Fri Mar 25 11:04:20 2011 +0100
fence_cisco_ucs: Fix for support for sub-organization
Resolves: rhbz#678902
---
fence/agents/cisco_ucs/fence_cisco_ucs.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fence/agents/cisco_ucs/fence_cisco_ucs.py b/fence/agents/cisco_ucs/fence_cisco_ucs.py
index 3e0b172..8505c31 100755
--- a/fence/agents/cisco_ucs/fence_cisco_ucs.py
+++ b/fence/agents/cisco_ucs/fence_cisco_ucs.py
@@ -41,7 +41,7 @@ def set_power_status(conn, options):
}[options["-o"]]
try:
- res = send_command(options, "<configConfMos cookie=\"" + options["cookie"] + "\" inHierarchical=\"no\"><inConfigs><pair key=\"org-root/ls-" + options["-n"] + "/power\"><lsPower dn=\"org-root/ls-" + options["-n"] + "/power\" state=\"" + action + "\" status=\"modified\" /></pair></inConfigs></configConfMos>")
+ res = send_command(options, "<configConfMos cookie=\"" + options["cookie"] + "\" inHierarchical=\"no\"><inConfigs><pair key=\"org-root" + options["-s"] + "/ls-" + options["-n"] + "/power\"><lsPower dn=\"org-root/ls-" + options["-n"] + "/power\" state=\"" + action + "\" status=\"modified\" /></pair></inConfigs></configConfMos>")
except pycurl.error, e:
sys.stderr.write(e[1] + "\n")
fail(EC_TIMED_OUT)
13 years
fence-agents: master - fence_cisco_ucs: Fix for support for sub-organization
by Marek Grác
Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=com...
Commit: 2be096c234ea7f4592c36759ba965a0f2c1879dc
Parent: 71d6b61273be24289d1ef64e81af291305cb5660
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Fri Mar 25 11:00:35 2011 +0100
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Fri Mar 25 11:00:35 2011 +0100
fence_cisco_ucs: Fix for support for sub-organization
Resolves: rhbz#678094
---
fence/agents/cisco_ucs/fence_cisco_ucs.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fence/agents/cisco_ucs/fence_cisco_ucs.py b/fence/agents/cisco_ucs/fence_cisco_ucs.py
index 87c4bd2..a41349a 100755
--- a/fence/agents/cisco_ucs/fence_cisco_ucs.py
+++ b/fence/agents/cisco_ucs/fence_cisco_ucs.py
@@ -41,7 +41,7 @@ def set_power_status(conn, options):
}[options["-o"]]
try:
- res = send_command(options, "<configConfMos cookie=\"" + options["cookie"] + "\" inHierarchical=\"no\"><inConfigs><pair key=\"org-root/ls-" + options["-n"] + "/power\"><lsPower dn=\"org-root/ls-" + options["-n"] + "/power\" state=\"" + action + "\" status=\"modified\" /></pair></inConfigs></configConfMos>")
+ res = send_command(options, "<configConfMos cookie=\"" + options["cookie"] + "\" inHierarchical=\"no\"><inConfigs><pair key=\"org-root" + options["-s"] + "/ls-" + options["-n"] + "/power\"><lsPower dn=\"org-root/ls-" + options["-n"] + "/power\" state=\"" + action + "\" status=\"modified\" /></pair></inConfigs></configConfMos>")
except pycurl.error, e:
sys.stderr.write(e[1] + "\n")
fail(EC_TIMED_OUT)
13 years