CloudyScripts 1.8.29 → 1.8.30

data/Rakefile

@@ -12,7 +12,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'CloudyScripts'
-  s.version = '1.8.29'
+  s.version = '1.8.30'
   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

@@ -34,7 +34,7 @@ class RemoteCommandHandler
   # * 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})
+    @ssh_session = Net::SSH.start(ip, user_name, :keys => [keyfile], :timeout => timeout, :verbose => :warn)
     @use_sudo = true unless user_name.strip == 'root'
   end
 
@@ -45,7 +45,7 @@ class RemoteCommandHandler
   # * 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})
+    @ssh_session = Net::SSH.start(ip, user, :key_data => [key_data], :timeout => timeout, :verbose => :warn)
     @use_sudo = true unless user.strip == 'root'
   end
 
@@ -63,7 +63,27 @@ class RemoteCommandHandler
   def retrieve_os()
     get_output("uname -r").strip
   end
-  
+
+  # Get root partition label
+  def get_root_device()
+    get_output("cat /etc/mtab | grep -E '[[:blank:]]+\/[[:blank:]]+' | cut -d ' ' -f 1").strip
+  end
+
+  # Get root partition label
+  def get_root_label(root_device)
+    get_output("e2label #{root_device}").strip
+  end
+
+  # Set root partition label
+  def set_root_label(root_device, label)
+    remote_execute("e2label #{root_device} #{label}", nil, false)
+  end
+
+  # Get filesystem type
+  def get_root_fs_type()
+    get_output("cat /etc/mtab | grep -E '[[:blank:]]+\/[[:blank:]]+' | cut -d ' ' -f 3").strip
+  end
+
   # Installs the software package specified.
   def install(software_package)
     e = "yum -yq install #{software_package}"
@@ -87,7 +107,8 @@ class RemoteCommandHandler
 
   def create_filesystem(fs_type, volume)
     e = "mkfs -t #{fs_type} #{volume}"
-    remote_execute(e, "y") #TODO: quiet mode?
+    #remote_execute(e, "y") #TODO: quiet mode?
+    remote_execute(e, nil, false)
   end
 
   def mkdir(path)
@@ -148,19 +169,49 @@ class RemoteCommandHandler
     end
     e = "rsync -avHx #{exclude} #{source_path} #{dest_path}"
     @logger.debug "going to execute #{e}"
-    remote_exec_helper(e, nil, nil, false) #TODO: handle output in stderr?
+    remote_exec_helper(e, nil, nil, true) #TODO: handle output in stderr?
   end
 
-  # Copy directory via an ssh-tunnel.
-  def remote_rsync(keyfile, source_path, dest_ip, dest_path)
+  # Rsync directory via an ssh-tunnel.
+  def remote_rsync_old(keyfile, source_path, dest_ip, dest_path)
     e = "rsync -rlpgoDzq -e "+'"'+"ssh -o stricthostkeychecking=no -i #{keyfile}"+'"'+" #{source_path} root@#{dest_ip}:#{dest_path}"
     @logger.debug "going to execute #{e}"
     remote_exec_helper(e, nil, nil, false) #TODO: handle output in stderr?
   end
 
+  # Disable 'Defaults requiretty' option in sudoers file
+  def disable_sudoers_requiretty()
+    e = "sed -r -e \'s/^(Defaults[[:blank:]]+requiretty)$/# \\1/\' -i /etc/sudoers"
+    @logger.debug "going to execute '#{e}'"
+    status = remote_exec_helper(e, nil, nil, true)
+    if status != true
+      raise Exception.new("disabling 'requiretty' from sudoers failed with status: #{status}")
+    end
+  end
+
+  # Enable 'Defaults requiretty' option in sudoers file
+  def enable_sudoers_requiretty()
+    e = "sed -r -e \'s/^#[[:blank:]]*(Defaults[[:blank:]]+requiretty)$/\\1/\' -i /etc/sudoers"
+    @logger.debug "going to execute '#{e}'"
+    status = remote_exec_helper(e, nil, nil, true)
+    if status != true
+      raise Exception.new("enabling 'requiretty' from sudoers failed with status: #{status}")
+    end
+  end
+
+  def remote_rsync(keyfile, source_path, dest_ip, dest_user, dest_path)
+    e = "rsync -rlpgoDzq --rsh 'ssh -o stricthostkeychecking=no -i #{keyfile}' --rsync-path='sudo rsync'"+
+          " #{source_path} #{dest_user}@#{dest_ip}:#{dest_path}"
+    @logger.debug "going to execute #{e}"
+    status = remote_exec_helper(e, nil, nil, true) #TODO: handle output in stderr?
+    if status != true
+      raise Exception.new("rsync bewteen source and target servers failed with status: #{status}")
+    end
+  end
+
   # Copy directory via an ssh-tunnel.
-  def scp(keyfile, source_path, dest_ip, dest_path)
-    e = "scp -Cpqr -o stricthostkeychecking=no -i #{keyfile} #{source_path} root@#{dest_ip}:#{dest_path}"
+  def scp(keyfile, source_path, dest_ip, dest_user, dest_path)
+    e = "scp -Cpqr -o stricthostkeychecking=no -i #{keyfile} #{source_path} #{dest_user}@#{dest_ip}:#{dest_path}"
     @logger.debug "going to execute #{e}"
     remote_exec_helper(e, nil, nil, false) #TODO: handle output in stderr?
   end
@@ -195,7 +246,6 @@ class RemoteCommandHandler
   # When #raise_exception is set, an exception will be raised instead of
   # returning false.
   def remote_execute(exec_string, push_data = nil, raise_exception = false)
-    #XXX: command line: echo -e 'y' | mkfs -t ext3 /dev/sdf
     exec_string = "echo #{push_data} >tmp.txt; #{exec_string} <tmp.txt; rm -f tmp.txt" unless push_data == nil
     stdout = []
     stderr = []
@@ -251,9 +301,18 @@ class RemoteCommandHandler
     result = true
     sudo = (@use_sudo ? "sudo " : "")
     the_channel = @ssh_session.open_channel do |channel|
+      if sudo
+        channel.request_pty do |ch, success|
+          if success
+            @logger.debug("pty successfully obtained")
+          else
+            @logger.debug("could not obtain pty")
+          end
+        end
+      end
       channel.exec("#{sudo}#{exec_string}") do |ch, success|
         if success
-          @logger.debug("RemoteCommandHandler: starts executing #{sudo}#{exec_string}") if debug
+          @logger.debug("RemoteCommandHandler: starts executing '#{sudo}#{exec_string}'") if debug
           ch.on_data() do |ch, data|
             stdout << data unless data == nil || stdout == nil
           end

data/lib/help/state_transition_helper.rb

@@ -112,6 +112,7 @@ module StateTransitionHelper
     image_props = ec2_handler.describe_images(:image_id => ami_id)
     architecture = image_props['imagesSet']['item'][0]['architecture']
     instance_type = "m1.small"
+    #instance_type = "t1.micro"
     if architecture != "i386"
       instance_type = "m1.large"
     end
@@ -455,11 +456,41 @@ module StateTransitionHelper
     post_message("filesystem system successfully created")
   end
 
+  # Create a file-system on a given machine (assumes to be connected already).
+  # Input Parameters:
+  # * dns_name => IP used
+  # * device => device to be used for file-system creation (e.g. /dev/sdj)
+  # * type => filesystem type (ext2, ext3, ext4)
+  # * label => add a label to the partition
+  def create_labeled_fs(dns_name, device, type, label)
+    post_message("going to create filesystem on #{dns_name} to #{device}...")
+    @logger.debug "create filesystem of type '#{type}' (default is ext3) on '#{dns_name}' to '#{device}'"
+    fs_type = "ext3"
+    if !type.nil? && !type.empty?
+      fs_type = type
+    end
+    @logger.debug "create '#{fs_type}' filesystem on device '#{device}'"
+    status = remote_handler().create_filesystem(fs_type, device)
+    if status == false
+      raise Exception.new("failed to create #{type} filesystem on #{device} device on #{dns_name}")
+    end
+    post_message("filesystem system successfully created")
+    if !label.nil? && !label.empty?
+      post_message("going to add label #{label} for device #{device}...")
+      @logger.debug "add label '#{label}' to device '#{device}'"
+      if remote_handler().set_root_label(device, label)
+        post_message("label #{label} added to device #{device}")
+      else
+        raise Exception.new("failed to add label #{label} to device #{device}")
+      end
+    end
+  end
+
   # Create a file-system on a given machine (assumes to be connected already).
   # Input Parameters:
   # * mount_point => directory to be mounted on the device
   # * device => device used for mounting
-  def mount_fs(mount_point, device)
+  def mount_fs_old(mount_point, device)
     post_message("going to mount #{device} on #{mount_point}...")
     @logger.debug "mount #{device} on #{mount_point}"
     if !remote_handler.file_exists?(mount_point)
@@ -482,6 +513,52 @@ module StateTransitionHelper
     post_message("mount successful")
   end
 
+  def mount_fs(mount_point, device)
+    post_message("going to mount #{device} on #{mount_point}...")
+    @logger.debug "mount #{device} on #{mount_point}"
+    if !remote_handler.file_exists?(mount_point)
+      post_message("creating mount point #{mount_point}...")
+      @logger.debug "creating mount point #{mount_point}"
+      remote_handler().mkdir(mount_point)
+    end
+    #XXX: detect new kernel that have /dev/xvdX device node instaed of /dev/sdX
+    if device =~ /\/dev\/sd[a-z]/
+      if !remote_handler().file_exists?(device)
+        post_message("'#{device}' device node not found, checking for new kernel support...")
+        @logger.debug "'#{device}' device node not found, checking for new kernel support" 
+        new_device = device.gsub('sd', 'xvd')
+        if remote_handler().file_exists?(new_device)
+          post_message("'#{new_device}' device node found")
+          @logger.debug "'#{new_device}' device node found"
+          device = new_device
+        end
+      end
+    #elsif device =~/\/dev\/xvd[a-z]/
+    end
+
+    done = false
+    timeout = 120
+    while timeout > 0
+      res = remote_handler().mount(device, mount_point)
+      if remote_handler().drive_mounted?(mount_point)
+        done = true
+        timeout = 0
+      end
+      sleep(5)
+      timeout -= 5
+    end
+    msg = ""
+    if !done
+      msg = "Failed to mount device '#{device}' to '#{mount_point}"
+      @logger.error "#{msg}"
+      raise Exception.new("device #{device} not mounted")
+    else
+      msg = "device #{device} successfully mounted" 
+      @logger.info "#{msg}"
+    end
+    post_message("#{msg}")
+  end
+
   # Unmount a drive
   # Input Parameters:
   # * mount_point => directory to be unmounted
@@ -496,6 +573,39 @@ module StateTransitionHelper
     post_message("device unmounted")
   end
 
+  # Get root partition label
+  def get_root_partition_label()
+    post_message("Retrieving '/' root partition label if any...")
+    @logger.debug "get root partition label"
+    # get root device and then its label
+    root_device = remote_handler().get_root_device()
+    @logger.debug "Found '#{root_device}' as root device"
+    label = remote_handler().get_root_label(root_device)
+    @logger.debug "Found label '#{label}'"
+    if label.nil? || label.empty?
+      post_message("'/' root partition has no label specified")
+    else
+      post_message("'/' root partition label '#{label}' for root device node '#{root_device}'")
+    end
+    return label
+  end
+
+  # get root filesytem type
+  def get_root_partition_fs_type()
+    post_message("Retrieving '/' root partition filesystem type...")
+    @logger.debug "get root partition filesystel type"
+    # get root device and then its fs type
+    root_fs_type = remote_handler().get_root_fs_type()
+    @logger.debug "Found '#{root_fs_type}' as root filesystem type"
+    if root_fs_type.nil? || root_fs_type.empty?
+      raise Exception.new("Failed to retrieve filesystem type for '/' root partition")
+    else
+      post_message("'/' root partition contains an #{root_fs_type} filesystem")
+    end
+    return root_fs_type
+  
+  end
+
   # Copy all files of a running linux distribution via rsync to a mounted directory
   # Input Parameters:
   # * destination_path => where to copy to
@@ -541,7 +651,7 @@ module StateTransitionHelper
     post_message("EBS volume successfully zipped")
   end
 
-  def remote_copy(user_name, keyname, source_dir, dest_machine, dest_dir)
+  def remote_copy_old(user_name, keyname, source_dir, dest_machine, dest_dir)
     post_message("going to remote copy all files from volume. This may take some time...")
     key_path_candidates = ["/#{user_name}/.ssh/", "/home/#{user_name}/.ssh/"]
     key_path_candidates.each() {|key_path|
@@ -560,6 +670,39 @@ module StateTransitionHelper
     post_message("remote copy operation done")
   end
 
+  def disable_ssh_tty(host)
+    post_message("going to disable SSH tty on #{host}...")
+    @logger.debug "disable SSH tty on "
+    remote_handler().disable_sudoers_requiretty()
+    post_message("SSH tty disabled")
+  end
+
+  def enable_ssh_tty(host)
+    post_message("going to enable SSH tty on #{host}...")
+    @logger.debug "enable SSH tty on"
+    remote_handler().enable_sudoers_requiretty()
+    post_message("SSH tty enabled")
+  end
+
+  def remote_copy(user_name, keyname, source_dir, dest_machine, dest_user, dest_dir)
+    post_message("going to remote copy all files from volume. This may take some time...")
+    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_user, dest_dir)
+        else
+          @logger.debug "use scp command #{key_file}"
+          remote_handler().scp(key_file, source_dir, dest_machine, dest_user, 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 #{user}@#{ip}:#{target_file}")
     remote_handler().upload(ip, user, key_data, file, target_file)
@@ -582,6 +725,122 @@ module StateTransitionHelper
     end
   end
 
+  # Mapping AmazonKernel Image IDs
+  # From documentation: http://docs.amazonwebservices.com/AWSEC2/latest/UserGuide/index.html?UserProvidedkernels.html
+  # * US-East-1
+  #    aki-4c7d9525 ec2-public-images/pv-grub-hd00-V1.01-i386.gz.manifest.xml
+  #    aki-4e7d9527 ec2-public-images/pv-grub-hd00-V1.01-x86_64.gz.manifest.xml
+  #    aki-407d9529 ec2-public-images/pv-grub-hd0-V1.01-i386.gz.manifest.xml
+  #    aki-427d952b ec2-public-images/pv-grub-hd0-V1.01-x86_64.gz.manifest.xml
+  #    aki-525ea73b ec2-public-images/pv-grub-hd00_1.02-i386.gz.manifest.xml
+  #    aki-8e5ea7e7 ec2-public-images/pv-grub-hd00_1.02-x86_64.gz.manifest.xml
+  #    aki-805ea7e9 ec2-public-images/pv-grub-hd0_1.02-i386.gz.manifest.xml
+  #    aki-825ea7eb ec2-public-images/pv-grub-hd0_1.02-x86_64.gz.manifest.xml
+  # * US-West-1
+  #    aki-9da0f1d8 ec2-public-images-us-west-1/pv-grub-hd00-V1.01-i386.gz.manifest.xml
+  #    aki-9fa0f1da ec2-public-images-us-west-1/pv-grub-hd00-V1.01-x86_64.gz.manifest.xml
+  #    aki-99a0f1dc ec2-public-images-us-west-1/pv-grub-hd0-V1.01-i386.gz.manifest.xml
+  #    aki-9ba0f1de ec2-public-images-us-west-1/pv-grub-hd0-V1.01-x86_64.gz.manifest.xml
+  #    aki-87396bc2 ec2-public-images-us-west-1/pv-grub-hd00_1.02-i386.gz.manifest.xml
+  #    aki-81396bc4 ec2-public-images-us-west-1/pv-grub-hd00_1.02-x86_64.gz.manifest.xml
+  #    aki-83396bc6 ec2-public-images-us-west-1/pv-grub-hd0_1.02-i386.gz.manifest.xml
+  #    aki-8d396bc8 ec2-public-images-us-west-1/pv-grub-hd0_1.02-x86_64.gz.manifest.xml
+  # * EU-West-1
+  #    aki-47eec433 ec2-public-images-eu/pv-grub-hd00-V1.01-i386.gz.manifest.xml
+  #    aki-41eec435 ec2-public-images-eu/pv-grub-hd00-V1.01-x86_64.gz.manifest.xml
+  #    aki-4deec439 ec2-public-images-eu/pv-grub-hd0-V1.01-i386.gz.manifest.xml
+  #    aki-4feec43b ec2-public-images-eu/pv-grub-hd0-V1.01-x86_64.gz.manifest.xml
+  #    aki-8a6657fe ec2-public-images-eu/pv-grub-hd00_1.02-i386.gz.manifest.xml
+  #    aki-60695814 ec2-public-images-eu/pv-grub-hd00_1.02-x86_64.gz.manifest.xml
+  #    aki-64695810 ec2-public-images-eu/pv-grub-hd0_1.02-i386.gz.manifest.xml
+  #    aki-62695816 ec2-public-images-eu/pv-grub-hd0_1.02-x86_64.gz.manifest.xml
+  # * AP-SouthEast-1
+  #    aki-6fd5aa3d ec2-public-images-ap-southeast-1/pv-grub-hd00-V1.01-i386.gz.manifest.xml
+  #    aki-6dd5aa3f ec2-public-images-ap-southeast-1/pv-grub-hd00-V1.01-x86_64.gz.manifest.xml
+  #    aki-13d5aa41 ec2-public-images-ap-southeast-1/pv-grub-hd0-V1.01-i386.gz.manifest.xml
+  #    aki-11d5aa43 ec2-public-images-ap-southeast-1/pv-grub-hd0-V1.01-x86_64.gz.manifest.xml
+  #    aki-a0225af2 ec2-public-images-ap-southeast-1/pv-grub-hd00_1.02-i386.gz.manifest.xml
+  #    aki-a6225af4 ec2-public-images-ap-southeast-1/pv-grub-hd00_1.02-x86_64.gz.manifest.xml
+  #    aki-a4225af6 ec2-public-images-ap-southeast-1/pv-grub-hd0_1.02-i386.gz.manifest.xml
+  #    aki-aa225af8 ec2-public-images-ap-southeast-1/pv-grub-hd0_1.02-x86_64.gz.manifest.xml
+  # * AP-NorthEast-1
+  #    aki-d209a2d3 ec2-public-images-ap-northeast-1/pv-grub-hd0-V1.01-i386.gz.manifest.xml
+  #    aki-d409a2d5 ec2-public-images-ap-northeast-1/pv-grub-hd0-V1.01-x86_64.gz.manifest.xml
+  #    aki-d609a2d7 ec2-public-images-ap-northeast-1/pv-grub-hd00-V1.01-i386.gz.manifest.xml
+  #    aki-d809a2d9 ec2-public-images-ap-northeast-1/pv-grub-hd00-V1.01-x86_64.gz.manifest.xml
+  #    aki-e85df7e9 ec2-public-images-ap-northeast-1/pv-grub-hd00_1.02-i386.gz.manifest.xml
+  #    aki-ea5df7eb ec2-public-images-ap-northeast-1/pv-grub-hd00_1.02-x86_64.gz.manifest.xml
+  #    aki-ec5df7ed ec2-public-images-ap-northeast-1/pv-grub-hd0_1.02-i386.gz.manifest.xml
+  #    aki-ee5df7ef ec2-public-images-ap-northeast-1/pv-grub-hd0_1.02-x86_64.gz.manifest.xml
+  def get_aws_kernel_image_aki(source_region, source_aki, target_region)
+    map = { 'us-east-1' => {'aki-4c7d9525' => 'pv-grub-hd00-V1.01-i386',
+                            'aki-4e7d9527' => 'pv-grub-hd00-V1.01-x86_64',
+                            'aki-407d9529' => 'pv-grub-hd0-V1.01-i386',
+                            'aki-427d952b' => 'pv-grub-hd0-V1.01-x86_64',
+                            'aki-525ea73b' => 'pv-grub-hd00_1.02-i386',
+                            'aki-8e5ea7e7' => 'pv-grub-hd00_1.02-x86_64',
+                            'aki-805ea7e9' => 'pv-grub-hd0_1.02-i386',
+                            'aki-825ea7eb' => 'pv-grub-hd0_1.02-x86_64'
+                           }, 
+            'us-west-1' => {'aki-9da0f1d8' => 'pv-grub-hd00-V1.01-i386',
+                            'aki-9fa0f1da' => 'pv-grub-hd00-V1.01-x86_64',
+                            'aki-99a0f1dc' => 'pv-grub-hd0-V1.01-i386',
+                            'aki-9ba0f1de' => 'pv-grub-hd0-V1.01-x86_64',
+                            'aki-87396bc2' => 'pv-grub-hd00_1.02-i386',
+                            'aki-81396bc4' => 'pv-grub-hd00_1.02-x86_64',
+                            'aki-83396bc6' => 'pv-grub-hd0_1.02-i386',
+                            'aki-8d396bc8' => 'pv-grub-hd0_1.02-x86_64'
+                           },
+            'eu-west-1' => {'aki-47eec433' => 'pv-grub-hd00-V1.01-i386',
+                            'aki-41eec435' => 'pv-grub-hd00-V1.01-x86_64',
+                            'aki-4deec439' => 'pv-grub-hd0-V1.01-i386',
+                            'aki-4feec43b' => 'pv-grub-hd0-V1.01-x86_64',
+                            'aki-8a6657fe' => 'pv-grub-hd00_1.02-i386',
+                            'aki-60695814' => 'pv-grub-hd00_1.02-x86_64',
+                            'aki-64695810' => 'pv-grub-hd0_1.02-i386',
+                            'aki-62695816' => 'pv-grub-hd0_1.02-x86_64'
+                           },
+            'ap-southeast-1' => {'aki-6fd5aa3d' => 'pv-grub-hd00-V1.01-i386',
+                                 'aki-6dd5aa3f' => 'pv-grub-hd00-V1.01-x86_64',
+                                 'aki-13d5aa41' => 'pv-grub-hd0-V1.01-i386',
+                                 'aki-11d5aa43' => 'pv-grub-hd0-V1.01-x86_64',
+                                 'aki-a0225af2' => 'pv-grub-hd00_1.02-i386',
+                                 'aki-a6225af4' => 'pv-grub-hd00_1.02-x86_64',
+                                 'aki-a4225af6' => 'pv-grub-hd0_1.02-i386',
+                                 'aki-aa225af8' => 'pv-grub-hd0_1.02-x86_64'
+                           },
+            'ap-northeast-1' => {'aki-d209a2d3' => 'pv-grub-hd00-V1.01-i386',
+                                 'aki-d409a2d5' => 'pv-grub-hd00-V1.01-x86_64',
+                                 'aki-d609a2d7' => 'pv-grub-hd0-V1.01-i386',
+                                 'aki-d809a2d9' => 'pv-grub-hd0-V1.01-x86_64',
+                                 'aki-e85df7e9' => 'pv-grub-hd00_1.02-i386',
+                                 'aki-ea5df7eb' => 'pv-grub-hd00_1.02-x86_64',
+                                 'aki-ec5df7ed' => 'pv-grub-hd0_1.02-i386',
+                                 'aki-ee5df7ef' => 'pv-grub-hd0_1.02-x86_64'
+                           }
+          }
+    target_aki = ''
+    if map[source_region] == nil
+      Exception.new("source region not supported")
+    elsif map[target_region] == nil
+      Exception.new("target region not supported")
+    else
+      if map[source_region][source_aki] == nil
+        Exception.new("aki not found in source region")
+      else
+        pv_grub_info = map[source_region][source_aki]
+        map[target_region].each() {|key, value|
+          if pv_grub_info.eql?(value)
+            target_aki = key
+            break
+          end
+        }
+      end
+    end
+    return target_aki
+  end
+
+
   #setting/retrieving handlers
 
   def remote_handler()

data/lib/scripts/ec2/ami2_ebs_conversion.rb

@@ -112,7 +112,10 @@ class Ami2EbsConversion < Ec2Script
         @context[:ssh_keyfile], @context[:ssh_keydata],
         @context[:connect_trials], @context[:connect_interval]
       )
-      create_fs(@context[:dns_name], @context[:temp_device_name])
+      # get root partition label and filesystem type
+      @context[:label] = get_root_partition_label()
+      @context[:fs_type] = get_root_partition_fs_type()
+      create_labeled_fs(@context[:dns_name], device, @context[:fs_type], @context[:label])      
       FileSystemCreated.new(@context)
     end
   end
@@ -120,7 +123,6 @@ class Ami2EbsConversion < Ec2Script
   # File system created. Mount it.
   class FileSystemCreated < Ami2EbsConversionState
     def enter
-      #@context[:mount_dir] = "/mnt/tmp_#{@context[:volume_id]}"
       @context[:mount_dir] = "/ebs_#{@context[:volume_id]}"
       mount_fs(@context[:mount_dir], @context[:temp_device_name])
       FileSystemMounted.new(@context)

data/lib/scripts/ec2/copy_ami.rb

@@ -118,8 +118,11 @@ class CopyAmi < Ec2Script
       device = @context[:temp_device_name]
       mount_point = "/mnt/tmp_#{@context[:source_volume_id]}"
       attach_volume(@context[:source_volume_id], @context[:source_instance_id], device)
-      connect(@context[:source_dns_name], @context[:source_ssh_username], nil, @context[:source_ssh_keydata])
+      connect(@context[:source_dns_name], @context[:source_ssh_username], nil, @context[:source_ssh_keydata]) 
       mount_fs(mount_point, device)
+      # get root partition label and filesystem type
+      @context[:label] = get_root_partition_label()
+      @context[:fs_type] = get_root_partition_fs_type()
       disconnect()
       SourceVolumeReadyState.new(@context)
     end
@@ -151,7 +154,7 @@ class CopyAmi < Ec2Script
       mount_point = "/mnt/tmp_#{@context[:target_volume_id]}"
       attach_volume(@context[:target_volume_id], @context[:target_instance_id], device)
       connect(@context[:target_dns_name], @context[:target_ssh_username], nil, @context[:target_ssh_keydata])
-      create_fs(@context[:target_dns_name], device)
+      create_labeled_fs(@context[:target_dns_name], device, @context[:fs_type], @context[:label])
       mount_fs(mount_point, device)
       disconnect()
       TargetVolumeReadyState.new(@context)
@@ -177,10 +180,19 @@ class CopyAmi < Ec2Script
   # Now we can copy.
   class KeyInPlaceState < CopyAmiState
     def enter()
+      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_volume_id]}/"
       dest_dir = "/mnt/tmp_#{@context[:target_volume_id]}"
-      remote_copy(@context[:source_ssh_username], @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], @context[:target_ssh_username], dest_dir)
+      disconnect()
+      #
+      connect(@context[:target_dns_name], @context[:target_ssh_username], nil, @context[:target_ssh_keydata])
+      enable_ssh_tty(@context[:target_dns_name])
       disconnect()
       DataCopiedState.new(@context)
     end
@@ -200,8 +212,14 @@ class CopyAmi < Ec2Script
   class TargetSnapshotCreatedState < CopyAmiState
     def enter()
       remote_region()
+      # Get Amazon Kernel Image ID
+      aki = get_aws_kernel_image_aki(@context[:ec2_api_handler].server.split('.')[1], @context[:kernel_id], 
+        @context[:target_ec2_handler].server.split('.')[1])
+      #@context[:result][:image_id] = register_snapshot(@context[:new_snapshot_id], @context[:name],
+      #  @context[:root_device_name], @context[:description], nil,
+      #  nil, @context[:architecture])
       @context[:result][:image_id] = register_snapshot(@context[:new_snapshot_id], @context[:name],
-        @context[:root_device_name], @context[:description], nil,
+        @context[:root_device_name], @context[:description], aki,
         nil, @context[:architecture])
       AmiRegisteredState.new(@context)
     end

data/lib/scripts/ec2/copy_snapshot.rb

@@ -96,6 +96,9 @@ class CopySnapshot< Ec2Script
       attach_volume(@context[:source_volume_id], @context[:source_instance_id], device)
       connect(@context[:source_dns_name], @context[:source_ssh_username], nil, @context[:source_ssh_keydata])
       mount_fs(mount_point, device)
+      # get root partition label and filesystem type
+      @context[:label] = get_root_partition_label()
+      @context[:fs_type] = get_root_partition_fs_type()
       disconnect()
       SourceVolumeReadyState.new(@context)
     end
@@ -127,7 +130,7 @@ class CopySnapshot< Ec2Script
       mount_point = "/mnt/tmp_#{@context[:target_volume_id]}"
       attach_volume(@context[:target_volume_id], @context[:target_instance_id], device)
       connect(@context[:target_dns_name], @context[:target_ssh_username], nil, @context[:target_ssh_keydata])
-      create_fs(@context[:target_dns_name], device)
+      create_labeled_fs(@context[:target_dns_name], device, @context[:fs_type], @context[:label])
       mount_fs(mount_point, device)
       disconnect()
       TargetVolumeReadyState.new(@context)
@@ -153,10 +156,19 @@ class CopySnapshot< Ec2Script
   # Now we can copy.
   class KeyInPlaceState < CopySnapshotState
     def enter()
+      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_volume_id]}/"
       dest_dir = "/mnt/tmp_#{@context[:target_volume_id]}"
-      remote_copy(@context[:source_ssh_username], @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], @context[:target_ssh_username], dest_dir)
+      disconnect()
+      #
+      connect(@context[:target_dns_name], @context[:target_ssh_username], nil, @context[:target_ssh_keydata])
+      enable_ssh_tty(@context[:target_dns_name])
       disconnect()
       DataCopiedState.new(@context)
     end
@@ -204,4 +216,4 @@ end
 #perform an rsynch
 #sync -PHAXaz --rsh "ssh -i /home/${src_user}/.ssh/id_${dst_keypair}" --rsync-path "sudo rsync" ${src_dir}/ ${dst_user}@${dst_public_fqdn}:${dst_dir}/
 #create a snapshot of the volume
-#clean-up everything
+#clean-up everything

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: CloudyScripts
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 1
   - 8
-  - 29
-  version: 1.8.29
+  - 30
+  version: 1.8.30
 platform: ruby
 authors: 
 - Matthias Jung
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-07 00:00:00 +00:00
+date: 2011-07-19 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency