ironfan 4.9.2 → 4.9.3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v4.9.3
+* cluster_launch: cleaning up duplication and misinformation
+* ec2/machine: cleaning up output on launch
+
 # v4.9.2
 * Ec2::Machine: trying a more brute-force solution to 'server went away' bug
 

data/VERSION

@@ -1 +1 @@
-4.9.2
+4.9.3

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.9.2"
+  s.version = "4.9.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2013-04-15"
+  s.date = "2013-04-16"
   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

@@ -95,12 +95,12 @@ class Chef
         # As each server finishes, configure it
         Ironfan.parallel(launched) do |computer|
           if (computer.is_a?(Exception)) then ui.warn "Error launching #{computer.inspect}; skipping after-launch tasks."; next; end
-          Ironfan.step(computer.name, 'launching', :white)
           perform_after_launch_tasks(computer)
         end
 
         if healthy?
-          ui.info "Applying aggregations:"
+          section('All computers launched correctly', :white)
+          section('Applying aggregations:')
           all_computers(*@name_args).aggregate
         end
 
@@ -108,23 +108,17 @@ class Chef
       end
 
       def perform_after_launch_tasks(computer)
-        Ironfan.step(computer.name, 'waiting for ready', :white)
-        # Wait for machine creation on amazon side
-        computer.machine.wait_for{ ready? }
-        
         # Try SSH
         unless config[:dry_run]
           Ironfan.step(computer.name, 'trying ssh', :white)
+          # FIXME: This is EC2-specific, abstract it
           address = computer.machine.vpc_id.nil? ? computer.machine.public_hostname : computer.machine.public_ip_address
           nil until tcp_test_ssh(address){ sleep @initial_sleep_delay ||= 10  }
         end
-
-        Ironfan.step(computer.name, 'final provisioning', :white)
-        computer.save
         
         # Run Bootstrap
         if config[:bootstrap]
-          Chef::Log.warn "UNTESTED --bootstrap"
+          Ironfan.step(computer.name, 'bootstrapping', :green)
           run_bootstrap(computer)
         end
       end

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

@@ -172,6 +172,7 @@ module Ironfan
 
             # Trying a more brute force "I tell you 3 times", to get around
             #   https://github.com/infochimps-labs/ironfan/issues/271
+            Ironfan.step(fog_server.id,"waiting for machine to be ready", :gray)
             begin
               fog_server.wait_for { ready? }
             rescue Fog::Errors::Error => e
@@ -179,7 +180,8 @@ module Ironfan
               raise if try > 3
               try += 1
               pause_for = 3 * try
-              ui.info "Rescue ##{try} for #{e}, sleeping #{pause_for} seconds"
+              Ironfan.step(fog_server.id,"rescue ##{try}, sleeping #{pause_for} seconds")
+              Ironfan.ui.debug "Error was #{e.inspect}"
               sleep pause_for
               retry
             end
@@ -220,8 +222,8 @@ module Ironfan
           info  = [computer.name, cloud.inspect]
           errors = {}
           server_errors = computer.server.lint
-          errors["Unhappy Server"] = server_errors if server_errors.present?
-          errors["No AMI found"] = info if cloud.image_id.blank?
+          errors["Unhappy Server"]      = server_errors   if server_errors.present?
+          errors["No AMI found"]        = info            if cloud.image_id.blank?
           errors['Missing client']      = info            unless computer.client?
           errors['Missing private_key'] = computer.client unless computer.private_key
           #
@@ -235,8 +237,6 @@ module Ironfan
           cloud = computer.server.cloud(:ec2)
           user_data_hsh =               {
             :chef_server =>             Chef::Config[:chef_server_url],
-            # :validation_client_name => Chef::Config[:validation_client_name],
-            #
             :node_name =>               computer.name,
             :organization =>            Chef::Config[:organization],
             :cluster_name =>            computer.server.cluster_name,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ironfan
 version: !ruby/object:Gem::Version
-  version: 4.9.2
+  version: 4.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -359,7 +359,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1939807353001774463
+      hash: 3514382002150288212
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: