ironfan 4.7.2 → 4.7.3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v4.7.3
+* cluster ssh was broken for VPC instances, this will fix a few bugs (fixes #236, thanks @gwilton)
+* cluster_ssh & cluster_launch: cleaning up SSH usage to handle VPC
+* Enhanced IP enhanced: adds auto_elastic_ip DSL and detection, mutually exclusive with regular elastic_ip (thanks @schade)
+
 # v4.7.2
 * elastic_ip: ensuring that elastic IPs work with VPC instances (thanks @schade)
 

data/VERSION

@@ -1 +1 @@
-4.7.2
+4.7.3

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.7.2"
+  s.version = "4.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2013-01-10"
+  s.date = "2013-01-14"
   s.description = "Ironfan allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks."
   s.email = "coders@infochimps.com"
   s.extra_rdoc_files = [

data/lib/chef/knife/cluster_launch.rb

@@ -115,7 +115,8 @@ class Chef
         # Try SSH
         unless config[:dry_run]
           Ironfan.step(computer.name, 'trying ssh', :white)
-          nil until tcp_test_ssh(computer.machine.dns_name){ sleep @initial_sleep_delay ||= 10  }
+          address = computer.machine.vpc_id.nil? ? computer.machine.public_target : computer.machine.public_ip_address
+          nil until tcp_test_ssh(address){ sleep @initial_sleep_delay ||= 10  }
         end
 
         Ironfan.step(computer.name, 'final provisioning', :white)
@@ -128,22 +129,25 @@ class Chef
         end
       end
 
-      def tcp_test_ssh(hostname)
-        tcp_socket = TCPSocket.new(hostname, 22)
+      def tcp_test_ssh(target)
+        tcp_socket = TCPSocket.new(target, 22)
         readable = IO.select([tcp_socket], nil, nil, 5)
         if readable
-          Chef::Log.debug("sshd accepting connections on #{hostname}, banner is #{tcp_socket.gets}")
+          Chef::Log.debug("sshd accepting connections on #{target}, banner is #{tcp_socket.gets}")
           yield
           true
         else
           false
         end
       rescue Errno::ETIMEDOUT
+	Chef::Log.debug("ssh to #{target} timed out")
         false
       rescue Errno::ECONNREFUSED
+	Chef::Log.debug("ssh connection to #{target} refused")
         sleep 2
         false
       rescue Errno::EHOSTUNREACH
+	Chef::Log.debug("ssh host #{target} unreachable")
         sleep 2
         false
       ensure

data/lib/chef/knife/cluster_ssh.rb

@@ -47,11 +47,9 @@ class Chef
 
         config[:attribute]     ||= Chef::Config[:knife][:ssh_address_attribute] || "fqdn"
         config[:ssh_user]      ||= Chef::Config[:knife][:ssh_user]
-#        config[:identity_file] ||= target.ssh_identity_file
 
-#         @action_nodes = target.chef_nodes
         target = target.select {|t| not t.bogus? }
-        addresses = target.map {|c| c.machine.public_hostname }.compact
+        addresses = target.map {|c| c.machine.vpc_id.nil? ? c.machine.public_hostname : c.machine.public_ip_address }.compact
 
         (ui.fatal("No nodes returned from search!"); exit 10) if addresses.nil? || addresses.length == 0
 

data/lib/ironfan/dsl/ec2.rb

@@ -26,6 +26,8 @@ module Ironfan
       magic :placement_group,           String
       magic :provider,                  Whatever,       :default => Ironfan::Provider::Ec2
       magic :elastic_ip,                String
+      magic :auto_elastic_ip,           String
+      magic :allocation_id,             String
       magic :region,                    String,         :default => ->{ default_region }
       collection :security_groups,      Ironfan::Dsl::Ec2::SecurityGroup, :key_method => :name
       magic :ssh_user,                  String,         :default => ->{ image_info[:ssh_user] }

data/lib/ironfan/provider/ec2/elastic_ip.rb

@@ -4,11 +4,11 @@ module Ironfan
 
       class ElasticIp < Ironfan::Provider::Resource
       	delegate :addresses, :associate_address, :allocation_id, 
-            :allocation_id=, :destroy, :domain, :domain=, 
-            :describe_addresses, :disassociate_address, :domain, :id,
-            :network_interface_id, :network_interface_id=, :public_ip, 
-            :public_ip=, :public_ip_address, :save, :server=, :server, :server_id, 
-            :server_id=,
+            :allocation_id=, :allocate_address, :auto_elastic_ip, :destroy, 
+            :domain, :domain=, :describe_addresses, :disassociate_address, 
+            :domain, :id, :network_interface_id, :network_interface_id=, 
+            :public_ip, :public_ip=, :public_ip_address, :save, :server=, 
+            :server, :server_id, :server_id=,
         :to => :adaptee
  
         def self.shared?()              true;                               end
@@ -30,7 +30,12 @@ module Ironfan
             #   is passed to knife and aids in troubleshooting any refusal to
             #   attach Elastic IPs
             Chef::Log.debug( "AWS domain: #{eip.domain}" )
-            Chef::Log.debug( "available ip match: #{eip.public_ip}" )
+            if eip.public_ip.nil?
+              Chef::Log.debug( "no Elastic IPs currently allocated" )
+            else
+              Chef::Log.debug( "available ip match: #{eip.public_ip}" )
+              Chef::Log.debug( "available allocation_id match: #{eip.allocation_id}" )
+            end
             Chef::Log.debug( "----------------------" )
           end
 
@@ -53,6 +58,32 @@ module Ironfan
           return unless computer.created?
           return unless elastic_ip = computer.server.ec2.elastic_ip
           return unless recall? elastic_ip
+          # also, in the case of VPC Elastic IPs, can discover and use allocation_id to attach a VPC Elastic IP.
+          return unless computer.server.ec2.include?(:elastic_ip)
+          if ( computer.server.ec2.elastic_ip.nil? and cloud.vpc.nil? )
+            # First,  :elastic_ip is set, no address is currently allocated for this connection's owner
+            # NOTE: We cannot specify an address to create, but after a reload we can then load the first available.
+            if computer.server.addresses.nil?
+              Ec2.connection.allocate_address
+              load!
+              elastic_ip = computer.server.addresses.first.public_ip
+              Chef::Log.debug( "allocating new Elastic IP address" )
+            else
+              # Second, :elastic_ip is set, has an address available to use but has no set value available in facet definition.
+              elastic_ip = computer.server.addresses.first.public_ip
+              Chef::Log.debug( "using first available Elastic IP address" )
+            end
+          elsif ( !computer.server.ec2.elastic_ip.nil? or cloud.vpc.nil? )
+            # Third,  :elastic_ip is set, has an address available to use, has a set value in facet definition and is not VPC.
+            elastic_ip = computer.server.ec2.elastic_ip
+            Chef::Log.debug( "using requested Elastic IP address" )
+          elsif ( computer.server.ec2.elastic_ip.nil? and !cloud.vpc.nil? )
+            # Fourth, is exactly like Third but on a VPC domain. (this is functionaility for attaching VPC Elastic IPS)
+            allocation_id = computer.server.ec2.allocation_id
+            Chef::Log.debug( "using Elastic IP address matched to given Allocation ID" )
+          else
+            ui.fatal("You have set both :elastic_ip and :auto_elastic_ip in your facet definition; which are mutually exclusive.")
+          end
           Ironfan.step(computer.name, "associating Elastic IP #{elastic_ip}", :blue)
           Ironfan.unless_dry_run do
             Ironfan.safely do

metadata

@@ -2,7 +2,7 @@
 name: ironfan
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 4.7.2
+  version: 4.7.3
 platform: ruby
 authors: 
 - Infochimps
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-10 00:00:00 Z
+date: 2013-01-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef
@@ -282,7 +282,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3116104857531814331
+      hash: 240697130002937334
       segments: 
       - 0
       version: "0"