ironfan 6.1.0 → 6.1.3

data/lib/chef/knife/cluster_launch.rb

@@ -100,16 +100,27 @@ class Chef
         section("Launching computers", :green)
         display(target)
         launched = target.launch
-        # As each server finishes, configure it
+
+        # As each server finishes, configure it. If we received an
+        # exception launching any of the machines, remember it.
+
+        launch_succeeded = true
         Ironfan.parallel(launched) do |computer|
-          if (computer.is_a?(Exception)) then ui.warn "Error launching #{computer.inspect}; skipping after-launch tasks."; next; end
-          perform_after_launch_tasks(computer) if computer.machine.perform_after_launch_tasks?
+          if (computer.is_a?(Exception)) then
+            ui.error "Error launching #{computer.inspect}; skipping after-launch tasks.";
+            launch_succeeded = false
+          else
+            perform_after_launch_tasks(computer) if computer.machine.perform_after_launch_tasks?
+          end
         end
 
-        if healthy?
+        if healthy? and launch_succeeded
           section('All computers launched correctly', :white)
           section('Applying aggregations:')
           all_computers(*@name_args).aggregate
+        else
+          section('Some computers could not be launched')
+          exit 1
         end
 
         display(target)

data/lib/chef/knife/ironfan_knife_common.rb

@@ -48,7 +48,6 @@ module Ironfan
     def discover_computers(realm_name, cluster_name, facet_name, slice_indexes)
       realm = Ironfan.load_realm(realm_name)
       realm.clusters.each{ |cluster| Ironfan.load_cluster cluster.name }
-      realm.resolve!
       clusters = cluster_name ? Array(realm.clusters[cluster_name.to_sym]) : realm.clusters.to_a
       return broker.discover!(clusters, config[:cloud])
     end

data/lib/ironfan/dsl/cluster.rb

@@ -27,6 +27,10 @@ module Ironfan
         self.cluster_role  Ironfan::Dsl::Role.new(name: Compute.cluster_role_name(realm_name, cluster_name))
       end
 
+      def resolve
+        self.class.definitions[name.to_sym] = super
+      end
+
       # Utility method to reference all servers from constituent facets
       def servers
         result = Gorillib::ModelCollection.new(item_type: Ironfan::Dsl::Server, key_method: :full_name)

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

@@ -173,18 +173,16 @@ module Ironfan
           launch_desc = launch_description(computer)
           Chef::Log.debug(JSON.pretty_generate(launch_desc))
 
-          Ironfan.safely do
-            fog_server = Ec2.connection.servers.create(launch_desc)
-            machine = Machine.new(:adaptee => fog_server)
-            computer.machine = machine
-            remember machine, :id => computer.name
-
-            Ironfan.step(fog_server.id,"waiting for machine to be ready", :gray)
-            Ironfan.tell_you_thrice     :name           => fog_server.id,
-                                        :problem        => "server unavailable",
-                                        :error_class    => Fog::Errors::Error do
-              fog_server.wait_for { ready? }
-            end
+          fog_server = Ec2.connection.servers.create(launch_desc)
+          machine = Machine.new(:adaptee => fog_server)
+          computer.machine = machine
+          remember machine, :id => computer.name
+
+          Ironfan.step(fog_server.id,"waiting for machine to be ready", :gray)
+          Ironfan.tell_you_thrice     :name           => fog_server.id,
+                                      :problem        => "server unavailable",
+                                      :error_class    => Fog::Errors::Error do
+            fog_server.wait_for { ready? }
           end
 
           # tag the computer correctly

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

@@ -152,7 +152,12 @@ module Ironfan
                 vpc_id    = tokens.pop
                 Ec2.connection.create_security_group(group_id,"Ironfan created group #{group_id}",vpc_id)
               rescue Fog::Compute::AWS::Error => e # InvalidPermission.Duplicate
-                Chef::Log.info("ignoring security group error: #{e}")
+                case e.message
+                when /SecurityGroupLimitExceeded/
+                  raise e
+                else
+                  Chef::Log.info("ignoring security group error: #{e}")
+                end
               end
             end
           end

data/lib/ironfan/version.rb

@@ -1,3 +1,3 @@
 module Ironfan
-  VERSION = '6.1.0'
+  VERSION = '6.1.3'
 end

data/lib/ironfan.rb

@@ -31,10 +31,10 @@ module Ironfan
     return existing if attrs.empty? && !block_given?
     if existing
       existing.receive!(attrs, &blk)
-      # existing.resolve!
+      existing.resolve!
     else
       cl = Ironfan::Dsl::Cluster.define(attrs.merge(name: name.to_sym), &blk)
-      # cl.resolve!
+      cl.resolve!
     end
   end
 
@@ -43,10 +43,10 @@ module Ironfan
     return existing if attrs.empty? && !block_given?
     if existing
       existing.receive!(attrs, &blk)
-      # existing.resolve!
+      existing.resolve!
     else
       rlm = Ironfan::Dsl::Realm.define(attrs.merge(name: name.to_sym), &blk)
-      # rlm.resolve!
+      rlm.resolve!
     end
   end
 

data/spec/ironfan/realm_spec.rb

@@ -102,11 +102,14 @@ describe Ironfan::Dsl::Realm do
   it 'should create clusters that can be edited later' do
     Ironfan.realm :xy do
       cluster(:baz)
-      cluster(:baz){ facet :bif }
     end
 
-    Ironfan.cluster(:baz).facets.to_a.should_not(be_empty)
-    Ironfan.cluster(:baz).servers.to_a.first.should_not(be_nil)
+    Ironfan.cluster(:baz) do
+      facet :bif
+    end
+
+    Ironfan.realm(:xy).cluster(:baz).facets.to_a.should_not(be_empty)
+    Ironfan.realm(:xy).cluster(:baz).servers.to_a.first.should_not(be_nil)
   end
 
   it 'should create clusters with names prefixed by its own' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ironfan
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -318,7 +318,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1983446031386045195
+      hash: -2080363730222460341
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -327,7 +327,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1983446031386045195
+      hash: -2080363730222460341
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25