fence-agents: master - fence_egenera: Allow fence_egenera to specify ssh login name

fence-agents: master - fence_egenera: Allow fence_egenera to specify ssh login name

[Marek Grác]

Gitweb:        http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commitdiff;h=0015b691d70f071c1dc84cdca5e102e36f5e5f60
Commit:        0015b691d70f071c1dc84cdca5e102e36f5e5f60
Parent:        2366224b4607a5780d5ffe351c6dc4de289de7fd
Author:        Marek 'marx' Grac <mgrac@redhat.com>
AuthorDate:    Fri Mar 6 16:10:45 2009 +0100
Committer:     Marek 'marx' Grac <mgrac@redhat.com>
CommitterDate: Fri Mar 6 16:10:45 2009 +0100

fence_egenera: Allow fence_egenera to specify ssh login name

- bz #488958 - this patch should be shipped in 5.3 (closed errata)
    but was not included
- 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 dd4f5af..a193fb0 100644
--- a/fence/agents/egenera/fence_egenera.pl
+++ b/fence/agents/egenera/fence_egenera.pl
@@ -41,6 +41,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";
 	
@@ -74,7 +75,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;
@@ -85,6 +86,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 
 {
@@ -92,6 +94,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;
@@ -157,6 +160,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
@@ -182,7 +189,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(): $!";
 
@@ -270,7 +277,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(): $!";
 
@@ -334,7 +341,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(): $!";