CloudyScripts 1.8.32 → 1.8.33

data/Rakefile

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

@@ -101,7 +101,7 @@ class RemoteCommandHandler
     else
       cmd = "e2label #{device} #{label}"
     end
-    remote_execute("e2label #{device} #{label}", nil, false)
+    remote_execute(cmd, nil, false)
   end
 
   # Get filesystem type

data/lib/help/state_transition_helper.rb

@@ -861,7 +861,7 @@ module StateTransitionHelper
   #    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)
+  def get_aws_kernel_image_aki(source_endpoint, source_aki, target_endpoint)
     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',
@@ -909,6 +909,8 @@ module StateTransitionHelper
                            }
           }
     target_aki = ''
+    source_region = get_aws_region_from_endpoint(source_endpoint)
+    target_region = get_aws_region_from_endpoint(target_endpoint)
     post_message("mapping AKI '#{source_aki}' from #{source_region} region to #{target_region} region...")
 
     if map[source_region] == nil
@@ -933,6 +935,24 @@ module StateTransitionHelper
     return target_aki
   end
 
+  def get_aws_region_from_endpoint(endpoint)
+    region = "us-east-1" 
+    case endpoint
+      when /us-east/
+        region = "us-east-1"
+      when /us-west/
+        region = "us-west-1"
+      when /eu-west/
+        region = "eu-west-1"
+      when /ap-southeast/
+        region = "ap-southeast-1"
+      when /ap-northeast/
+        region = "ap-northeast-1"
+      else
+        region = "us-east-1"
+    end
+    return region
+  end
 
   #setting/retrieving handlers
 

data/lib/scripts/ec2/copy_ami.rb

@@ -62,7 +62,6 @@ class CopyAmi < Ec2Script
     if @input_params[:target_ssh_username] == nil
       @input_params[:target_ssh_username] = "root"
     end
-
   end
 
   # Load the initial state for the script.
@@ -214,8 +213,10 @@ class CopyAmi < Ec2Script
     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])
+      #aki = get_aws_kernel_image_aki(@context[:ec2_api_handler].server.split('.')[0], @context[:kernel_id], 
+      #  @context[:target_ec2_handler].server.split('.')[0])
+      aki = get_aws_kernel_image_aki(@context[:ec2_api_handler].server, @context[:kernel_id], 
+        @context[:target_ec2_handler].server)
       #@context[:result][:image_id] = register_snapshot(@context[:new_snapshot_id], @context[:name],
       #  @context[:root_device_name], @context[:description], nil,
       #  nil, @context[:architecture])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: CloudyScripts
 version: !ruby/object:Gem::Version 
-  hash: 119
+  hash: 117
   prerelease: false
   segments: 
   - 1
   - 8
-  - 32
-  version: 1.8.32
+  - 33
+  version: 1.8.33
 platform: ruby
 authors: 
 - Matthias Jung