rubber 1.6.2 → 1.6.3

data/CHANGELOG

@@ -1,3 +1,11 @@
+1.6.2
+-----
+
+Fixed rake gems:install issue with Rails 2. <73c47a8> [Kevin Menard]
+RVM bump. <14b52bc> [Kevin Menard]
+Use the latest Ubuntu AMIs. <7a15b0d> [Kevin Menard]
+We shouldn't try to SSH into Windows machines. <f921685> [Kevin Menard]
+
 1.6.1
 -----
 

data/VERSION

@@ -1 +1 @@
-1.6.2
+1.6.3

data/lib/rubber/cloud/aws.rb

@@ -38,8 +38,9 @@ module Rubber
             instance = {}
             instance[:id] = item.instanceId
             instance[:external_host] = item.dnsName
-            instance[:external_ip] = IPSocket.getaddress(instance[:external_host]) rescue nil
+            instance[:external_ip] = item.ipAddress
             instance[:internal_host] = item.privateDnsName
+            instance[:internal_ip] = item.privateIpAddress
             instance[:state] = item.instanceState.name
             instance[:zone] = item.placement.availabilityZone
             instance[:platform] = item.platform || 'linux'

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

@@ -239,6 +239,7 @@ namespace :rubber do
       instance_item.external_host = instance[:external_host]
       instance_item.external_ip = instance[:external_ip]
       instance_item.internal_host = instance[:internal_host]
+      instance_item.internal_ip = instance[:internal_ip]
       instance_item.zone = instance[:zone]
       instance_item.platform = instance[:platform]
       rubber_instances.save()
@@ -270,18 +271,6 @@ namespace :rubber do
       # re-load the roles since we may have just defined new ones
       load_roles() unless env.disable_auto_roles
 
-      # 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?
-        instance_item.internal_ip = instance_item.external_ip
-      else
-        # Connect to newly created instance and grab its internal ip
-        # so that we can update all aliases
-        direct_connection(instance_item.external_ip) do
-          instance_item.internal_ip = capture(print_ip_command).strip
-        end
-      end
-
       rubber_instances.save()
 
       # Add the aliases for this instance to all other hosts

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubber
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 1
   - 6
-  - 2
-  version: 1.6.2
+  - 3
+  version: 1.6.3
 platform: ruby
 authors: 
 - Matt Conway
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-27 00:00:00 -04:00
+date: 2010-09-28 00:00:00 -04:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency