CloudyScripts 2.12.50 → 2.14.50

data/Rakefile

@@ -12,7 +12,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'CloudyScripts'
-  s.version = '2.12.50' #<number cloud-stacks supported>.<number cloud-scripts>.<counting releases>
+  s.version = '2.14.50' #<number cloud-stacks supported>.<number cloud-scripts>.<counting releases>
   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

@@ -66,12 +66,14 @@ class RemoteCommandHandler
 
   # Get root partition label
   def get_root_device()
-    get_output("cat /etc/mtab | grep -E '[[:blank:]]+\/[[:blank:]]+' | cut -d ' ' -f 1").strip
+    #get_output("cat /etc/mtab | grep -E '[[:blank:]]+\/[[:blank:]]+' | cut -d ' ' -f 1").strip
+    get_output("mount | grep -E '[[:blank:]]+\/[[:blank:]]+' | cut -d ' ' -f 1").strip
   end
 
   # Get partition label
   def get_partition_device(part)
-    get_output("cat /etc/mtab | grep -E '[[:blank:]]+" + "#{part}" + "[[:blank:]]+' | cut -d ' ' -f 1").strip
+    #get_output("cat /etc/mtab | grep -E '[[:blank:]]+" + "#{part}" + "[[:blank:]]+' | cut -d ' ' -f 1").strip
+    get_output("mount | grep -E '[[:blank:]]+" + "#{part}" + "[[:blank:]]+' | cut -d ' ' -f 1").strip
   end
 
   # Get device label

data/lib/help/state_transition_helper.rb

@@ -105,7 +105,7 @@ module StateTransitionHelper
   # * kernel_id => EC2 Kernel ID of the started instance
   # * ramdisk_id => EC2 Ramdisk ID of the started instance
   # * architecture => architecture (e.g. 386i, 64x) of the started instance
-  def launch_instance(ami_id, key_name, security_group_name, ec2_handler = nil, type = nil)
+  def launch_instance(ami_id, key_name, security_group_name, ec2_handler = nil, type = nil, availability_zone = nil)
     ec2_handler = ec2_handler() if ec2_handler == nil
     post_message("starting up instance to execute the script (AMI = #{ami_id}) ...")
     @logger.debug "start up AMI #{ami_id}"
@@ -124,7 +124,8 @@ module StateTransitionHelper
     # now start it
     res = ec2_handler.run_instances(:image_id => ami_id,
       :security_group => security_group_name, :key_name => key_name,
-      :instance_type => instance_type
+      :instance_type => instance_type, 
+      :availability_zone => availability_zone
     )
     instance_id = res['instancesSet']['item'][0]['instanceId']
     @logger.info "started instance #{instance_id}"
@@ -230,6 +231,43 @@ module StateTransitionHelper
     post_message("instance #{instance_id} is terminated")
   end
 
+  # Stop an instance.
+  # Input Parameters:
+  # * instance_id => ID of the instance to be shut down
+  def stop_instance(instance_id, timeout = 240)
+    post_message("going to stop the temporary instance #{instance_id}...")
+    @logger.debug "stop instance #{instance_id}"
+    res = ec2_handler().stop_instances(:instance_id => instance_id)
+    done = false
+    while timeout > 0 && !done
+      res = ec2_handler().describe_instances(:instance_id => instance_id)
+      state = res['reservationSet']['item'][0]['instancesSet']['item'][0]['instanceState']
+      @logger.debug "instance in state '#{state['name']}' (#{state['code']})"
+      if state['code'].to_i == 80 
+        done = true
+        timeout = 0
+      elsif state['code'].to_i != 64 
+        done = false
+        timeout = 0
+        msg = "instance in state '#{state['name']}'"
+        @logger.error "#{msg}"
+        post_message("#{msg}")
+      end
+      sleep(5)
+      timeout -= 5
+    end
+    msg = ""
+    if !done
+      msg = "Failed to stop instance '#{instance_id}"
+      @logger.error "#{msg}"
+      raise Exception.new("Unable to stop instance '#{instance_id}'}")
+    else
+      msg = "'#{instance_id}' successfully stopped" 
+      @logger.info "#{msg}" 
+    end
+    post_message("#{msg}")
+  end
+
   def retrieve_security_groups()
     @context[:script].post_message("going to retrieve security groups...")
     sgs = @context[:ec2_api_handler].describe_security_groups()
@@ -312,15 +350,15 @@ module StateTransitionHelper
   # * volume_id => EC2 ID for the EBS Volume to be attached
   # * instance_id => EC2 ID for the instance to which the volume is supposed to be attached to
   # * temp_device_name => device name to be used for attaching (e.g. /dev/sdj1)
-  def attach_volume(volume_id, instance_id, temp_device_name)
+  def attach_volume(volume_id, instance_id, temp_device_name, timeout = 240)
     post_message("going to attach volume #{volume_id} to instance #{instance_id} on device #{temp_device_name}...")
-    @logger.info "attach volume #{volume_id} to instance #{instance_id} on device #{temp_device_name}"
+    @logger.info "attach volume #{volume_id} to instance #{instance_id} on device #{temp_device_name} (using a timeout of #{timeout})s"
     ec2_handler().attach_volume(:volume_id => volume_id,
       :instance_id => instance_id,
       :device => temp_device_name
     )
     done = false
-    timeout = 120
+    #timeout = 120
     while timeout > 0
       res = ec2_handler().describe_volumes(:volume_id => volume_id)
       vol_state = res['volumeSet']['item'][0]['status']
@@ -352,14 +390,14 @@ module StateTransitionHelper
   # Input Parameters:
   # * volume_id => EC2 ID for the EBS Volume to be detached
   # * instance_id => EC2 ID for the instance to detach from
-  def detach_volume(volume_id, instance_id)
+  def detach_volume(volume_id, instance_id, timeout = 240)
     post_message("going to detach volume #{volume_id} from instance #{instance_id}...")
-    @logger.info "detach volume #{volume_id} from instance #{instance_id}"
+    @logger.info "detach volume #{volume_id} from instance #{instance_id} (using a timeout of #{timeout})s"
     ec2_handler().detach_volume(:volume_id => volume_id,
       :instance_id => instance_id
     )
     done = false
-    timeout = 120
+    #timeout = 120
     while timeout > 0
       sleep(3)
       res = ec2_handler().describe_volumes(:volume_id => volume_id)
@@ -428,6 +466,26 @@ module StateTransitionHelper
     post_message("snapshot #{snapshot_id} deleted")
   end
 
+  # Is Snapshot accessible?
+  def snapshot_accessible(snapshot_id)
+    post_message("checking snapshot '#{snapshot_id}' accessibility...")
+    @logger.info("checking snapshot '#{snapshot_id}' accessibility...")
+    begin
+      ec2_handler().describe_snapshots(:snapshot_id => snapshot_id)
+    rescue Exception => e
+      if e.to_str =~ /does not exist/ && e.to_str =~ /#{snapshot_id}/
+        post_message("'#{snapshot_id}' NOT accessible")
+        @logger.info("'#{snapshot_id}' NOT accessible")
+        return false
+      else
+        raise e
+      end
+   end
+   post_message("'#{snapshot_id}' accessible")
+   @logger.info("'#{snapshot_id}' accessible")
+   return true
+  end
+
   # Registers a snapshot as EBS-booted AMI.
   # Input Parameters:
   # * snapshot_id => EC2 Snapshot ID used to be used
@@ -733,6 +791,23 @@ module StateTransitionHelper
     return part_fs_type, part_label
   end
 
+  # Retrieve the root volume ID of an instance
+  def get_root_volume_id(instance_id)
+    post_message("getting 'root volume ID' (volume ID attached as RootDeviceName) of '#{instance_id}' instance...")
+    volume_id = nil
+    res = ec2_handler().describe_instances(:instance_id => instance_id)
+    root_device_name = res['reservationSet']['item'][0]['instancesSet']['item'][0]['rootDeviceName']
+    block_device_map = res['reservationSet']['item'][0]['instancesSet']['item'][0]['blockDeviceMapping']['item']
+    block_device_map.each(){|blk_dev|
+      if blk_dev['deviceName'] == root_device_name
+        volume_id = blk_dev['ebs']['volumeId']
+        post_message("found '#{volume_id}' attached as '#{root_device_name}' rootDeviceName")
+        break
+      end
+    }
+    return volume_id
+  end
+
   # Copy all files of a running linux distribution via rsync to a mounted directory
   # Input Parameters:
   # * destination_path => where to copy to

data/lib/scripts/ec2/ami2_ebs_conversion.rb

@@ -84,6 +84,7 @@ class Ami2EbsConversion < Ec2Script
   # which serves to create 
   class InitialState < Ami2EbsConversionState
     def enter
+      puts "DEBUG: params: #{@context[:ami_id]}, #{@context[:key_name]}, #{@context[:security_group_name]}"
       @context[:instance_id], @context[:dns_name], @context[:availability_zone], 
         @context[:kernel_id], @context[:ramdisk_id], @context[:architecture] =
         launch_instance(@context[:ami_id], @context[:key_name], @context[:security_group_name])
@@ -107,7 +108,7 @@ class Ami2EbsConversion < Ec2Script
     end
   end
 
-  # Storage attached. Create a file-system and moun it
+  # Storage attached. Create a file-system and mount it
   class StorageAttached < Ami2EbsConversionState
     def enter
       @context[:result][:os] =

data/lib/scripts/ec2/copy_ami.rb

@@ -189,8 +189,12 @@ class CopyAmi < Ec2Script
       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)
+      #XXX: fix the problem fo key name with white space
+      #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")
       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")
+        @context[:target_ssh_keyfile], "#{key_path}#{@context[:target_key_name].gsub(/\s+/, '_')}.pem")
+
       post_message("credentials are in place to connect source and target.")
       KeyInPlaceState.new(@context)
     end
@@ -206,7 +210,10 @@ 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[:source_ssh_username], @context[:target_key_name], source_dir, 
+      #XXX: fix the problem fo key name with white space
+      #remote_copy(@context[:source_ssh_username], @context[:target_key_name], source_dir, 
+      #  @context[:target_dns_name], @context[:target_ssh_username], dest_dir)
+      remote_copy(@context[:source_ssh_username], @context[:target_key_name].gsub(/\s+/, '_'), source_dir, 
         @context[:target_dns_name], @context[:target_ssh_username], dest_dir)
       disconnect()
       #

data/lib/scripts/ec2/copy_mswindows_ami.rb

@@ -54,11 +54,11 @@ class CopyMsWindowsAmi < Ec2Script
     if @input_params[:helper_ami_id] == nil && !(@input_params[:helper_ami_id] =~ /^ami-.*$/)
       raise Exception.new("Invalid Helper AMI ID specified: #{@input_params[:helper_ami_id]}")
     end
-    if @local_ec2_helper.ami_prop(@input_params[:helper_ami_id], 'rootDeviceType') != "ebs"
+    if @remote_ec2_helper.ami_prop(@input_params[:helper_ami_id], 'rootDeviceType') != "ebs"
       raise Exception.new("must be an EBS type image")
     end
-    if @local_ec2_helper.ami_prop(@input_params[:helper_ami_id], 'platform') != "windows"
-      raise Exception.new("Not a MS Windows AMI: #{@local_ec2_helper.ami_prop(@input_params[:helper_ami_id], 'platform')}")
+    if @remote_ec2_helper.ami_prop(@input_params[:helper_ami_id], 'platform') != "windows"
+      raise Exception.new("Not a MS Windows AMI: #{@remote_ec2_helper.ami_prop(@input_params[:helper_ami_id], 'platform')}")
     end
     # AWS Linux AMI, source and target region
     if @input_params[:source_ami_id] == nil && !(@input_params[:source_ami_id] =~ /^ami-.*$/)
@@ -138,6 +138,7 @@ class CopyMsWindowsAmi < Ec2Script
   #   - Volume size from this AMI
   #   - Availability Zone 
   #NB: less modification if we get the AZ from the launched instance
+  #NB: if we do not own this AMI, we have no snapshot, so we must launch an instance
   class InitialState < CopyMsWindowsAmiState 
     def enter()
       local_region()
@@ -149,13 +150,37 @@ class CopyMsWindowsAmi < Ec2Script
       #puts "Setting Source and Target Availability Zone if not set" 
       #@context[:source_availability_zone] = "us-east-1a" unless @context[:source_availability_zone] != nil
       #@context[:target_availability_zone] = "us-west-1a" unless @context[:target_availability_zone] != nil
-      puts "DEBUG: Parameters: #{@context[:snapshot_id]}, #{@context[:volume_size]}, #{@context[:architecture]}, #{@context[:root_device_name]}"
+
+      #try to access snapshot, if not possible, launch and stop an AMI to create one
+      if !snapshot_accessible(@context[:snapshot_id])
+        puts "The AMI's snapshot is NOT accessible, we must launch an instance to create one" 
+        
+      end
   
       #raise Exception.new("DEBUG: FORCED Script exit")   
       InitialStateDone.new(@context)
     end
   end
 
+  # Consitionnal State (launching an instance and creating a snapshot)
+  class InitialStateLaunch < CopyMsWindowsAmiState
+    def enter()
+      local_region()
+      puts "Launching and stopping an instance of the AMI to create a snapshot"
+      result = launch_instance(@context[:ami_id], @context[:source_key_name], @context[:source_security_groups])
+      instance_id = result.first
+      puts "Instance launched with ID: #{instance_id}"
+      puts "Waiting 3 minutes before stopping instance '#{instance_id}' for creating a Snapshot of the rootDevice"
+      sleep(180)
+      stop_instance(instance_id) 
+      puts "Instance '#{instance_id}' stopped, creating snapshot"
+      ebs_volume_id = ec2_helper.get_attached_volumes(instance_id)[0]['volumeId']
+      @context[:snapshot_id] = create_snapshot(ebs_volume_id, "Cloudy_Scripts Snapshot for copying AMIs")
+
+      InitialStateDone.new(@context)
+    end
+  end
+
   # Initial state: Launch an Amazon Linux AMI in the source Region
   class InitialStateDone < CopyMsWindowsAmiState 
     def enter()
@@ -318,11 +343,14 @@ class CopyMsWindowsAmi < Ec2Script
   # a remote copy.
   class TargetVolumeReadyState < CopyMsWindowsAmiState
     def enter()
-      post_message("upload key of target-instance to source-instance...")
+      post_message("Uploading 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)
+      #XXX: fix the problem fo key name with white space
+      #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")
       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")
+        @context[:target_ssh_keyfile], "#{key_path}#{@context[:target_key_name].gsub(/\s+/, '_')}.pem")
       post_message("credentials are in place to connect source and target (from source to target).")
 
       KeyInPlaceState.new(@context)
@@ -332,14 +360,18 @@ class CopyMsWindowsAmi < Ec2Script
   # Now we can copy.
   class KeyInPlaceState < CopyMsWindowsAmiState
     def enter()
+      post_message("Transfering archive from Source to Target Region...")
       connect(@context[:target_dns_name], @context[:target_ssh_username], nil, @context[:target_ssh_keydata])
       disable_ssh_tty(@context[:target_dns_name])
       disconnect()
       #
       connect(@context[:source_dns_name], @context[:source_ssh_username], nil, @context[:source_ssh_keydata])
-      source_dir = "/mnt/tmp_#{@context[:source_temp_volume_id]}"
-      dest_dir = "/mnt/tmp_#{@context[:target_temp_volume_id]}"
-      remote_copy(@context[:source_ssh_username], @context[:target_key_name], source_dir, 
+      source_dir = "/mnt/tmp_#{@context[:source_temp_volume_id]}/"
+      dest_dir = "/mnt/tmp_#{@context[:target_temp_volume_id]}/"
+      #XXX: fix the problem fo key name with white space
+      #remote_copy(@context[:source_ssh_username], @context[:target_key_name], source_dir, 
+      #  @context[:target_dns_name], @context[:target_ssh_username], dest_dir)
+      remote_copy(@context[:source_ssh_username], @context[:target_key_name].gsub(/\s+/, '_'), source_dir, 
         @context[:target_dns_name], @context[:target_ssh_username], dest_dir)
       disconnect()
       #
@@ -354,6 +386,7 @@ class CopyMsWindowsAmi < Ec2Script
   # Decompress data on the device
   class DataCopiedState < CopyMsWindowsAmiState
     def enter()
+      post_message("Dumping transfered archive to volume...")
       remote_region()
       connect(@context[:target_dns_name], @context[:target_ssh_username], nil, @context[:target_ssh_keydata])
       mount_point = "/mnt/tmp_#{@context[:target_temp_volume_id]}"
@@ -371,11 +404,10 @@ class CopyMsWindowsAmi < Ec2Script
   #XXX: TODO
   class RestoredDataState < CopyMsWindowsAmiState
     def enter()
+      post_message("Detaching migrated volume...")
       remote_region()
       detach_volume(@context[:target_volume_id], @context[:target_instance_id])
 
-      #@context[:new_snapshot_id] = create_snapshot(@context[:target_volume_id], "Created by CloudyScripts - copy_mswindows_ami")
-
       TargetVolumeCreatedState.new(@context)
     end
   end
@@ -385,21 +417,38 @@ class CopyMsWindowsAmi < Ec2Script
   #   - launch same AMI as the one we want to copy and stop it (after it has boot up): use helper_ami_id
   #   - detach the volume of this instance and attach the new volume
   #   - start the instance to see if everything is good, then stop it
-  #   - create an AMi from this instance
+  #   - create an AMI from this instance
   class TargetVolumeCreatedState < CopyMsWindowsAmiState
     def enter()
+      post_message("Launching Helper AMI '#{@context[:helper_ami_id]}' for attaching migrated volume...")
       remote_region()
       #XXX: launch instance in the right AZ
-      result = launch_instance(@context[:helper_ami_id], @context[:target_key_name], @context[:target_security_groups])
-      @context[:ihelper_instance_id] = result.first
+      result = launch_instance(@context[:helper_ami_id], @context[:target_key_name], @context[:target_security_groups], 
+                               nil, nil, @context[:target_availability_zone])
+      @context[:helper_instance_id] = result.first
       @context[:helper_dns_name] = result[1]
       @context[:helper_availability_zone] = result[2]
-      @context[:target_root_device_name] = result[6]
+      @context[:helper_root_device_name] = result[6]
 
       #XXX:
       #  - wait for it to be running, and then stop it
-      #  - wait for it to be stopped, and then sttart it with the new volume
-      shut_down_instance(@context[:source_instance_id])
+      #  - wait for it to be stopped, and then start it with the new volume
+      stop_instance(@context[:helper_instance_id])
+      root_volume_id = get_root_volume_id(@context[:helper_instance_id])
+      detach_volume(root_volume_id, @context[:helper_instance_id])
+      attach_volume(@context[:target_volume_id], @context[:helper_instance_id], @context[:helper_root_device_name])
+      start_instance(@context[:helper_instance_id])
+
+      #XXX: return running instance for now
+      @context[:result][:instance_id] = result.first
+
+      #XXX: stop this instance
+      stop_instance(@context[:helper_instance_id])
+
+      #XXX: register as AMI
+      new_ami_id = create_image(:instance_id => @context[:helper_instance_id], 
+        :name => @context[:name], :description => @context[:description])
+      @context[:result][:image_id] = new_ami_id
 
       AmiRegisteredState.new(@context)
     end
@@ -421,6 +470,7 @@ class CopyMsWindowsAmi < Ec2Script
   #     - delete source and temp volume
   class AmiRegisteredState < CopyMsWindowsAmiState
     def enter()
+      post_message("Cleaning Source and Target Regions...")
       local_region()
       connect(@context[:source_dns_name], @context[:source_ssh_username], nil, @context[:source_ssh_keydata])
       mount_point = "/mnt/tmp_#{@context[:source_temp_volume_id]}"
@@ -440,7 +490,7 @@ class CopyMsWindowsAmi < Ec2Script
       detach_volume(@context[:target_temp_volume_id], @context[:target_instance_id])
       shut_down_instance(@context[:target_instance_id])
       delete_volume(@context[:target_temp_volume_id])
-      delete_volume(@context[:target_volume_id])
+      #delete_volume(@context[:target_volume_id])
  
       Done.new(@context)
     end

data/lib/scripts/ec2/copy_mswindows_snapshot.rb

@@ -296,8 +296,11 @@ class CopyMsWindowsSnapshot < Ec2Script
       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)
+      #XXX: fix the problem fo key name with white space
+      #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")
       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")
+        @context[:target_ssh_keyfile], "#{key_path}#{@context[:target_key_name].gsub(/\s+/, '_')}.pem")
       post_message("credentials are in place to connect source and target (from source to target).")
 
       KeyInPlaceState.new(@context)
@@ -312,10 +315,14 @@ class CopyMsWindowsSnapshot < Ec2Script
       disconnect()
       #
       connect(@context[:source_dns_name], @context[:source_ssh_username], nil, @context[:source_ssh_keydata])
-      source_dir = "/mnt/tmp_#{@context[:source_temp_volume_id]}"
-      dest_dir = "/mnt/tmp_#{@context[:target_temp_volume_id]}"
-      remote_copy(@context[:source_ssh_username], @context[:target_key_name], source_dir, 
+      source_dir = "/mnt/tmp_#{@context[:source_temp_volume_id]}/"
+      dest_dir = "/mnt/tmp_#{@context[:target_temp_volume_id]}/"
+      #XXX: fix the problem fo key name with white space
+      #remote_copy(@context[:source_ssh_username], @context[:target_key_name], source_dir, 
+      #  @context[:target_dns_name], @context[:target_ssh_username], dest_dir)
+      remote_copy(@context[:source_ssh_username], @context[:target_key_name].gsub(/\s+/, '_'), source_dir, 
         @context[:target_dns_name], @context[:target_ssh_username], dest_dir)
+
       disconnect()
       #
       connect(@context[:target_dns_name], @context[:target_ssh_username], nil, @context[:target_ssh_keydata])
@@ -351,9 +358,7 @@ class CopyMsWindowsSnapshot < Ec2Script
       @context[:new_snapshot_id] = create_snapshot(@context[:target_volume_id], "Created by CloudyScripts - copy_mswindows_ami")
       @context[:result][:snapshot_id] = @context[:new_snapshot_id]
 
-      #XXX: for testing, bypass cleanup
-      Done.new(@context)
-      #TargetSnapshotCreatedState.new(@context)
+      TargetSnapshotCreatedState.new(@context)
     end
   end
 

data/lib/scripts/ec2/copy_snapshot.rb

@@ -149,8 +149,12 @@ class CopySnapshot< Ec2Script
       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], "#{key_path}#{@context[:target_key_name]}.pem")
+      #XXX: fix the problem fo key name with white space
+      #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")
       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")
+        @context[:target_ssh_keyfile], "#{key_path}#{@context[:target_key_name].gsub(/\s+/, '_')}.pem")
+
       post_message("credentials are in place to connect source and target.")
       KeyInPlaceState.new(@context)
     end
@@ -166,8 +170,12 @@ 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[:source_ssh_username], @context[:target_key_name], source_dir,
+      #XXX: fix the problem fo key name with white space
+      #remote_copy(@context[:source_ssh_username], @context[:target_key_name], source_dir,
+      #  @context[:target_dns_name], @context[:target_ssh_username], dest_dir)
+      remote_copy(@context[:source_ssh_username], @context[:target_key_name].gsub(/\s+/, '_'), source_dir,
         @context[:target_dns_name], @context[:target_ssh_username], dest_dir)
+ 
       disconnect()
       #
       connect(@context[:target_dns_name], @context[:target_ssh_username], nil, @context[:target_ssh_keydata])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: CloudyScripts
 version: !ruby/object:Gem::Version 
-  hash: 91
+  hash: 83
   prerelease: false
   segments: 
   - 2
-  - 12
+  - 14
   - 50
-  version: 2.12.50
+  version: 2.14.50
 platform: ruby
 authors: 
 - Matthias Jung
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-15 00:00:00 +00:00
+date: 2012-01-03 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency