This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
cluster: RHEL48 - fence_egenera: Allow fence_egenera to specify sshlogin name
- From: Marek GrÃc <marx at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Fri, 6 Mar 2009 16:18:20 +0000 (UTC)
- Subject: cluster: RHEL48 - fence_egenera: Allow fence_egenera to specify sshlogin name
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=8603c8797a5d989b653770b44555619c5d454cac
Commit: 8603c8797a5d989b653770b44555619c5d454cac
Parent: b1984701329f848f3b2ae6da7549101e0864f066
Author: Marek 'marx' Grac <mgrac@redhat.com>
AuthorDate: Fri Mar 6 15:14:49 2009 +0100
Committer: Marek 'marx' Grac <mgrac@redhat.com>
CommitterDate: Fri Mar 6 17:17:06 2009 +0100
fence_egenera: Allow fence_egenera to specify ssh login name
- bz #445931 - same patch as shipped with RHEL 5.3
- warning: -l is not used for login name but for lpan; so -u is used
---
fence/agents/egenera/fence_egenera.pl | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/fence/agents/egenera/fence_egenera.pl b/fence/agents/egenera/fence_egenera.pl
index 088c7d6..b65ad3e 100755
--- a/fence/agents/egenera/fence_egenera.pl
+++ b/fence/agents/egenera/fence_egenera.pl
@@ -45,6 +45,7 @@ sub usage
print " -l <string> lpan\n";
print " -o <string> Action: reboot (default), off, on or status\n";
print " -p <string> pserver\n";
+ print " -u <string> username (default=root)\n";
print " -q quiet mode\n";
print " -V version\n";
@@ -78,7 +79,7 @@ sub version
if (@ARGV > 0)
{
- getopts("c:hl:o:p:qV") || fail_usage ;
+ getopts("c:hl:o:p:u:qV") || fail_usage ;
usage if defined $opt_h;
version if defined $opt_V;
@@ -89,6 +90,7 @@ if (@ARGV > 0)
$lpan = $opt_l if defined $opt_l;
$pserv = $opt_p if defined $opt_p;
$action = $opt_o if defined $opt_o;
+ $user = $opt_u if defined $opt_u;
}
else
{
@@ -96,6 +98,7 @@ else
}
$action = "reboot" unless defined $action;
+$user = "root" unless defined $user;
fail "failed: no cserver defined" unless defined $cserv;
fail "failed: no lpan defined" unless defined $lpan;
@@ -161,6 +164,10 @@ sub get_options_stdin
{
$esh = $val;
}
+ elsif ($name eq "user" )
+ {
+ $user = $val;
+ }
# FIXME should we do more error checking?
# Excess name/vals will be eaten for now
@@ -186,7 +193,7 @@ sub _pserver_query_field
my $val;
- my $cmd = "ssh $cserv $esh pserver $lpan/$pserv";
+ my $cmd = "ssh -l $user $cserv $esh pserver $lpan/$pserv";
my $pid = open3 (\*WTR, \*RDR,\*RDR, $cmd)
or die "error open3(): $!";
@@ -274,7 +281,7 @@ sub pserver_boot
}
# Is there any harm in sending this command multiple times?
- my $cmd = "ssh $cserv $esh pserver -b $lpan/$pserv";
+ my $cmd = "ssh -l $user $cserv $esh pserver -b $lpan/$pserv";
my $pid = open3 (\*WTR, \*RDR,\*RDR, $cmd)
or die "error open3(): $!";
@@ -338,7 +345,7 @@ sub pserver_shutdown
# is there any harm in sending this command multiple
# times?
- my $cmd = "ssh $cserv $esh blade -s $_";
+ my $cmd = "ssh -l $user $cserv $esh blade -s $_";
print egen_log "shutdown: $cmd being called, before open3\n";
my $pid = open3 (\*WTR, \*RDR,\*RDR, $cmd)
or die "error open3(): $!";