CloudyScripts 1.5.22 → 1.5.23

data/Rakefile

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

data/lib/help/state_transition_helper.rb

@@ -37,11 +37,12 @@ module StateTransitionHelper
   # * ssh_keydata => contents of key-file (either use ssh_keyfile or ssh_keydata)
   # Returns:
   # * OS of the connected machine
-  def connect(dns_name, user_name, ssh_keyfile = nil, ssh_keydata = nil)
+  def connect(dns_name, user_name, ssh_keyfile = nil, ssh_keydata = nil,
+      trials = 5, wait_between_trials = 20)
     post_message("connecting '#{user_name}' to #{dns_name}...")
     connected = false
     last_connection_problem = ""
-    remaining_trials = 5
+    remaining_trials = trials-1
     while !connected && remaining_trials > 0
       remaining_trials -= 1
       if ssh_keyfile != nil
@@ -68,7 +69,7 @@ module StateTransitionHelper
         raise Exception.new("no key information specified")
       end
       if !connected
-        sleep(20) #try again
+        sleep(wait_between_trials) #try again
       end
     end
     if !connected

data/lib/scripts/ec2/ami2_ebs_conversion.rb

@@ -24,6 +24,8 @@ class Ami2EbsConversion < Ec2Script
   # * description => description on AMI to be created (optional)
   # * temp_device_name => [default /dev/sdj] device name used to attach the temporary storage; change this only if there's already a volume attacged as /dev/sdj (optional, default is /dev/sdj)
   # * root_device_name"=> [default /dev/sda1] device name used for the root device (optional)
+  # * connect_trials => number of trials during ssh connect to machine
+  # * connect_interval => seconds between two ssh connect trials
   def initialize(input_params)
     super(input_params)
   end
@@ -52,6 +54,12 @@ class Ami2EbsConversion < Ec2Script
     if @input_params[:ssh_username] == nil
       @input_params[:ssh_username] = "root"
     end
+    if @input_params[:connect_trials] == nil
+      @input_params[:connect_trials] = 6
+    end
+    if @input_params[:connect_interval] == nil
+      @input_params[:connect_interval] = 20
+    end
   end
 
   def load_initial_state()
@@ -100,7 +108,10 @@ class Ami2EbsConversion < Ec2Script
   class StorageAttached < Ami2EbsConversionState
     def enter
       @context[:result][:os] =
-        connect(@context[:dns_name], @context[:ssh_username], @context[:ssh_keyfile], @context[:ssh_keydata])
+        connect(@context[:dns_name], @context[:ssh_username],
+        @context[:ssh_keyfile], @context[:ssh_keydata],
+        @context[:connect_trials], @context[:connect_interval]
+      )
       create_fs(@context[:dns_name], @context[:temp_device_name])
       FileSystemCreated.new(@context)
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 22
-  version: 1.5.22
+  - 23
+  version: 1.5.23
 platform: ruby
 authors: 
 - Matthias Jung
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-10 00:00:00 +01:00
+date: 2011-01-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency