diff --git a/src/im_mad/im_ssh/one_im_ssh b/src/im_mad/im_ssh/one_im_ssh index 6bf146355f..af34f360a1 100755 --- a/src/im_mad/im_ssh/one_im_ssh +++ b/src/im_mad/im_ssh/one_im_ssh @@ -47,7 +47,7 @@ export_rc_vars $DRIVERRC # Go to var directory ONE_LOCATION/var or /var/lib/one cd $VAR_LOCATION -LOG_FILE=$DRIVER_NAME +LOG_FILE=one_im_ssh_$DRIVER_NAME # Execute the actual MAD execute_mad $* diff --git a/src/im_mad/im_ssh/one_im_ssh.rb b/src/im_mad/im_ssh/one_im_ssh.rb index 0ecdb503d2..243df86f1a 100755 --- a/src/im_mad/im_ssh/one_im_ssh.rb +++ b/src/im_mad/im_ssh/one_im_ssh.rb @@ -58,7 +58,11 @@ class InformationManager < OpenNebulaDriver #--------------------------------------------------------------------------- def action_monitor(number, host, do_update) if do_update == "1" - sync_cmd = "rsync -Laz #{REMOTES_LOCATION} #{host}:#{@remote_dir}" + # Use SCP to sync: + sync_cmd = "scp -r #{REMOTES_LOCATION}/. #{host}:#{@remote_dir}" + + # Use rsync to sync: + # sync_cmd = "rsync -Laz #{REMOTES_LOCATION} #{host}:#{@remote_dir}" LocalCommand.run(sync_cmd) else end @@ -86,6 +90,5 @@ remote_dir = ENV["IM_REMOTE_DIR"] remote_dir = "/tmp/one" if !remote_dir hypervisor = ARGV[0]||'' - im = InformationManager.new(remote_dir, hypervisor, 15) im.start_driver