CloudyScripts 1.8.30 → 1.8.31

data/Rakefile

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

@@ -69,14 +69,19 @@ class RemoteCommandHandler
     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
+  # Get partition label
+  def get_partition_device(part)
+    get_output("cat /etc/mtab | grep -E '[[:blank:]]+" + "#{part}" + "[[:blank:]]+' | cut -d ' ' -f 1").strip
+  end
+
+  # Get device label
+  def get_device_label(device)
+    get_output("e2label #{device}").strip
   end
 
-  # Set root partition label
-  def set_root_label(root_device, label)
-    remote_execute("e2label #{root_device} #{label}", nil, false)
+  # Set device label
+  def set_device_label(device, label)
+    remote_execute("e2label #{device} #{label}", nil, false)
   end
 
   # Get filesystem type
@@ -84,6 +89,11 @@ class RemoteCommandHandler
     get_output("cat /etc/mtab | grep -E '[[:blank:]]+\/[[:blank:]]+' | cut -d ' ' -f 3").strip
   end
 
+  # Get filesystem type
+  def get_partition_fs_type(part)
+    get_output("cat /etc/mtab | grep -E '[[:blank:]]+" + "#{part}" + "[[:blank:]]+' | cut -d ' ' -f 3").strip
+  end
+
   # Installs the software package specified.
   def install(software_package)
     e = "yum -yq install #{software_package}"
@@ -280,7 +290,7 @@ class RemoteCommandHandler
     exec_string = "echo #{push_data} >tmp.txt; #{exec_string} <tmp.txt; rm -f tmp.txt" unless push_data == nil
     stdout = []
     stderr = []
-    remote_exec_helper(exec_string, stdout, stderr)
+    remote_exec_helper(exec_string, stdout, stderr, true)
     stdout.join()
   end
 

data/lib/help/state_transition_helper.rb

@@ -478,7 +478,7 @@ module StateTransitionHelper
     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)
+      if remote_handler().set_device_label(device, label)
         post_message("label #{label} added to device #{device}")
       else
         raise Exception.new("failed to add label #{label} to device #{device}")
@@ -580,7 +580,7 @@ module StateTransitionHelper
     # 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)
+    label = remote_handler().get_device_label(root_device)
     @logger.debug "Found label '#{label}'"
     if label.nil? || label.empty?
       post_message("'/' root partition has no label specified")
@@ -590,7 +590,24 @@ module StateTransitionHelper
     return label
   end
 
-  # get root filesytem type
+  # Get partition label
+  def get_partition_label(part)
+    post_message("Retrieving '#{part}' partition label if any...")
+    @logger.debug "get #{part} partition label"
+    # get part device and then its label
+    part_device = remote_handler().get_partition_device(part)
+    @logger.debug "Found '#{part_device}' as partition device"
+    label = remote_handler().get_device_label(part_device)
+    @logger.debug "Found label '#{label}'"
+    if label.nil? || label.empty?
+      post_message("'#{part}' partition has no label specified")
+    else
+      post_message("'#{part}' partition label '#{label}' for device node '#{part_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"
@@ -603,7 +620,21 @@ module StateTransitionHelper
       post_message("'/' root partition contains an #{root_fs_type} filesystem")
     end
     return root_fs_type
-  
+  end
+
+  # Get partition filesytem type
+  def get_partition_fs_type(part)
+    post_message("Retrieving '#{part}' partition filesystem type...")
+    @logger.debug "get #{part} partition filesystel type"
+    # get partition device and then its fs type
+    part_fs_type = remote_handler().get_partition_fs_type(part)
+    @logger.debug "Found '#{part_fs_type}' as filesystem type"
+    if part_fs_type.nil? || part_fs_type.empty?
+      raise Exception.new("Failed to retrieve filesystem type for '#{part}' partition")
+    else
+      post_message("'#{part}' partition contains an #{part_fs_type} filesystem")
+    end
+    return part_fs_type
   end
 
   # Copy all files of a running linux distribution via rsync to a mounted directory

data/lib/scripts/ec2/copy_snapshot.rb

@@ -96,9 +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()
+      # get partition label and filesystem type
+      @context[:label] = get_partition_label(mount_point)
+      @context[:fs_type] = get_partition_fs_type(mount_point)
       disconnect()
       SourceVolumeReadyState.new(@context)
     end
@@ -146,7 +146,9 @@ class CopySnapshot< 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)
-      upload_file(@context[:source_dns_name], "root", @context[:source_ssh_keydata],
+      #upload_file(@context[:source_dns_name], "root", @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")
       post_message("credentials are in place to connect source and target.")
       KeyInPlaceState.new(@context)

metadata

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