rubber 1.5.10 → 1.5.11

data/CHANGELOG

@@ -1,3 +1,7 @@
+2.0.0.rails3
+-----
+
+
 1.5.9
 -----
 

data/VERSION

@@ -1 +1 @@
-1.5.10
+1.5.11

data/lib/rubber/recipes/rubber/instances.rb

@@ -245,29 +245,32 @@ namespace :rubber do
 
       # weird cap/netssh bug, sometimes just hangs forever on initial connect, so force a timeout
       begin
-        Timeout::timeout(10) do
+        Timeout::timeout(30) do
           # turn back on root ssh access if we are using root as the capistrano user for connecting
           enable_root_ssh(instance_item.external_ip, fetch(:initial_ssh_user, 'ubuntu')) if (user == 'root' && ! instance_item.windows?)
-
-          # setup amazon elastic ips if configured to do so
-          setup_static_ips
-      
-          # Need to setup aliases so ssh doesn't give us errors when we
-          # later try to connect to same ip but using alias
-          setup_local_aliases
+          # force a connection so if above isn't enabled we still timeout if initial connection hangs
+          direct_connection(instance_item.external_ip) do
+            run "echo"
+          end
         end
       rescue Timeout::Error
         logger.info "timeout in initial connect, retrying"
         retry
       end
 
+      # setup amazon elastic ips if configured to do so
+      setup_static_ips
+
+      # Need to setup aliases so ssh doesn't give us errors when we
+      # later try to connect to same ip but using alias
+      setup_local_aliases
 
       # re-load the roles since we may have just defined new ones
       load_roles() unless env.disable_auto_roles
 
       # Connect to newly created instance and grab its internal ip
       # so that we can update all aliases
-      task :_get_ip, :hosts => instance_item.external_ip do
+      direct_connection(instance_item.external_ip) do
         # There's no good way to get the internal IP for a Windows host, so just set it to the external
         # and let the router handle mapping to the internal network.
         if instance_item.windows?
@@ -279,17 +282,6 @@ namespace :rubber do
         rubber_instances.save()
       end
 
-      # even though instance is running, sometimes ssh hasn't started yet,
-      # so retry on connect failure
-      begin
-        _get_ip
-      rescue ConnectionError
-        sleep 2
-        logger.info "Failed to connect to #{instance_alias} (#{instance_item.external_ip}), retrying"
-        retry
-      end
-
-
       # Add the aliases for this instance to all other hosts
       setup_remote_aliases
       setup_dns_aliases

data/lib/rubber/recipes/rubber/setup.rb

@@ -42,6 +42,22 @@ namespace :rubber do
 
   end
 
+  # Forces a direct connection
+  def direct_connection(ip)
+    task_name = "_direct_connection_#{ip}_#{rand(1000)}"
+    task task_name, :hosts => ip do
+      yield
+    end
+
+    begin
+      send task_name
+    rescue ConnectionError => e
+      sleep 2
+      logger.info "Failed to connect to #{ip}, retrying"
+      retry
+    end
+  end
+
   desc <<-DESC
     Sets up aliases for instance hostnames based on contents of instance.yml.
     Generates /etc/hosts for local/remote machines and sets hostname on

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 10
-  version: 1.5.10
+  - 11
+  version: 1.5.11
 platform: ruby
 authors: 
 - Matt Conway
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-01 00:00:00 -04:00
+date: 2010-09-02 00:00:00 -04:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency