CloudyScripts 1.5.21 → 1.5.22

data/Rakefile

@@ -12,7 +12,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'CloudyScripts'
-  s.version = '1.5.21'
+  s.version = '1.5.22'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README.rdoc', 'LICENSE']
   s.summary = 'Scripts to facilitate programming for infrastructure clouds.'

data/lib/help/remote_command_handler.rb

@@ -16,6 +16,7 @@ class RemoteCommandHandler
   # * ip: ip address of the machine to connect to
   # * keyfile: path of the keyfile to be used for authentication
   def connect_with_keyfile(ip, user_name, keyfile, timeout = 30)
+    @use_sudo = false
     @ssh_session = Net::SSH.start(ip, user_name, {:keys => [keyfile], :timeout => timeout})
     @use_sudo = true unless user_name.strip == 'root'
   end
@@ -26,6 +27,7 @@ class RemoteCommandHandler
   # * user: user name
   # * key_data: key_data to be used for authentication
   def connect(ip, user, key_data, timeout = 30)
+    @use_sudo = false
     @ssh_session = Net::SSH.start(ip, user, {:key_data => [key_data], :timeout => timeout})
     @use_sudo = true unless user.strip == 'root'
   end

data/lib/help/state_transition_helper.rb

@@ -75,8 +75,9 @@ module StateTransitionHelper
       raise Exception.new("connection attempts stopped (#{last_connection_problem})")
     end
     os = remote_handler().retrieve_os()
-    post_message("connected to #{dns_name}. OS installed is #{os}")
-    @logger.info "connected to #{dns_name}"
+    sudo = remote_handler().use_sudo ? " [sudo]" : ""
+    post_message("connected to #{dns_name}#{sudo}. OS installed is #{os}")
+    @logger.info "connected to #{dns_name}#{sudo}"
     return os
   end
 
@@ -444,23 +445,47 @@ module StateTransitionHelper
     post_message("EBS volume successfully zipped")
   end
 
-  def remote_copy(keyname, source_dir, dest_machine, dest_dir)
+  def remote_copy(user_name, keyname, source_dir, dest_machine, dest_dir)
     post_message("going to remote copy all files from volume. This may take some time...")
-    if remote_handler().tools_installed?("rsync")
-      @logger.debug "use rsync command"
-      remote_handler().remote_rsync("/root/.ssh/#{keyname}.pem", source_dir, dest_machine, dest_dir)
-    else
-      @logger.debug "use scp command"
-      remote_handler().scp("/root/.ssh/#{keyname}.pem", source_dir, dest_machine, dest_dir)
-    end
+    key_path_candidates = ["/#{user_name}/.ssh/", "/home/#{user_name}/.ssh/"]
+    key_path_candidates.each() {|key_path|
+      key_file = "#{key_path}#{keyname}.pem"
+      if remote_handler().file_exists?(key_path)
+        if remote_handler().tools_installed?("rsync")
+          @logger.debug "use rsync command on #{key_file}"
+          remote_handler().remote_rsync(key_file, source_dir, dest_machine, dest_dir)
+        else
+          @logger.debug "use scp command #{key_file}"
+          remote_handler().scp(key_file, source_dir, dest_machine, dest_dir)
+        end
+        break
+      end
+    }
     post_message("remote copy operation done")
   end
 
   def upload_file(ip, user, key_data, file, target_file)
-    post_message("going to upload #{file} to #{ip}:/#{target_file}")
+    post_message("going to upload #{file} to #{user}@#{ip}:#{target_file}")
     remote_handler().upload(ip, user, key_data, file, target_file)
   end
 
+  # From a list of existing files, return the first that exists
+  def determine_file(ip, user_name, ssh_keydata, file_candidates)
+    connect(ip, user_name, nil, ssh_keydata)
+    begin
+      file_candidates.each() {|file_path|
+        if remote_handler().file_exists?(file_path)
+          return file_path
+        end
+      }
+      return nil
+    rescue
+      raise
+    ensure
+      disconnect()
+    end
+  end
+
   #setting/retrieving handlers
 
   def remote_handler()

data/lib/scripts/ec2/copy_ami.rb

@@ -164,8 +164,11 @@ class CopyAmi < Ec2Script
   class TargetVolumeReadyState < CopyAmiState
     def enter()
       post_message("upload key of target-instance to source-instance...")
-      upload_file(@context[:source_dns_name], "root", @context[:source_ssh_keydata],
-        @context[:target_ssh_keyfile], "/root/.ssh/#{@context[:target_key_name]}.pem")
+      path_candidates = ["/#{@context[:source_ssh_username]}/.ssh/",
+        "/home/#{@context[:source_ssh_username]}/.ssh/"]
+      key_path = determine_file(@context[:source_dns_name], @context[:source_ssh_username], @context[:source_ssh_keydata], path_candidates)
+      upload_file(@context[:source_dns_name], @context[:source_ssh_username], @context[:source_ssh_keydata],
+        @context[:target_ssh_keyfile], "#{key_path}#{@context[:target_key_name]}.pem")
       post_message("credentials are in place to connect source and target.")
       KeyInPlaceState.new(@context)
     end
@@ -177,7 +180,7 @@ class CopyAmi < Ec2Script
       connect(@context[:source_dns_name], @context[:source_ssh_username], nil, @context[:source_ssh_keydata])
       source_dir = "/mnt/tmp_#{@context[:source_volume_id]}/"
       dest_dir = "/mnt/tmp_#{@context[:target_volume_id]}"
-      remote_copy(@context[:target_key_name], source_dir, @context[:target_dns_name], dest_dir)
+      remote_copy(@context[:source_ssh_username], @context[:target_key_name], source_dir, @context[:target_dns_name], dest_dir)
       disconnect()
       DataCopiedState.new(@context)
     end

data/lib/scripts/ec2/copy_snapshot.rb

@@ -140,8 +140,11 @@ class CopySnapshot< Ec2Script
   class TargetVolumeReadyState < CopySnapshotState
     def enter()
       post_message("upload key of target-instance to source-instance...")
+      path_candidates = ["/#{@context[:source_ssh_username]}/.ssh/",
+        "/home/#{@context[:source_ssh_username]}/.ssh/"]
+      key_path = determine_file(@context[:source_dns_name], @context[:source_ssh_username], @context[:source_ssh_keydata], path_candidates)
       upload_file(@context[:source_dns_name], "root", @context[:source_ssh_keydata],
-        @context[:target_ssh_keyfile], "/root/.ssh/#{@context[:target_key_name]}.pem")
+        @context[:target_ssh_keyfile], "#{key_path}#{@context[:target_key_name]}.pem")
       post_message("credentials are in place to connect source and target.")
       KeyInPlaceState.new(@context)
     end
@@ -153,7 +156,7 @@ class CopySnapshot< Ec2Script
       connect(@context[:source_dns_name], @context[:source_ssh_username], nil, @context[:source_ssh_keydata])
       source_dir = "/mnt/tmp_#{@context[:source_volume_id]}/"
       dest_dir = "/mnt/tmp_#{@context[:target_volume_id]}"
-      remote_copy(@context[:target_key_name], source_dir, @context[:target_dns_name], dest_dir)
+      remote_copy(@context[:source_ssh_username], @context[:target_key_name], source_dir, @context[:target_dns_name], dest_dir)
       disconnect()
       DataCopiedState.new(@context)
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 21
-  version: 1.5.21
+  - 22
+  version: 1.5.22
 platform: ruby
 authors: 
 - Matthias Jung