From 0a191e113b48cd3bc7be59e7dc75ea2a7f4501f7 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Sat, 26 Nov 2011 01:41:02 +0100 Subject: [PATCH] feature #863: update remotes in OpenNebula driver when re-using a ssh stream --- src/mad/ruby/OpenNebulaDriver.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/mad/ruby/OpenNebulaDriver.rb b/src/mad/ruby/OpenNebulaDriver.rb index 5e8f6126a3..3ecbdd23bb 100644 --- a/src/mad/ruby/OpenNebulaDriver.rb +++ b/src/mad/ruby/OpenNebulaDriver.rb @@ -107,13 +107,14 @@ class OpenNebulaDriver < ActionManager execution = LocalCommand.run(command, log_method(id)) elsif options[:ssh_stream] if options[:stdin] - command = "cat << EOT | #{command}" - stdin = "#{options[:stdin]}\nEOT\n" + cmdin = "cat << EOT | #{command}" + stdin = "#{options[:stdin]}\nEOT\n" else - stdin = nil + cmdin = command + stdin = nil end - execution = options[:ssh_stream].run(command,stdin) + execution = options[:ssh_stream].run(cmdin, stdin, command) else execution = RemotesCommand.run(command,