knife-nodefu 0.0.2 → 0.0.3

data/lib/chef/knife/nodefu_base.rb

@@ -29,4 +29,12 @@ module NodefuBase
     raise ServerRangeError if end_range.to_i < start_range.to_i
     return [base_name,start_range,end_range]
   end
+
+  def failed_nodes(servers)
+    servers.select {|k,v| v['chef_node'].nil? || !v['failure'].nil? }    
+  end
+
+  def successful_nodes(servers)
+    servers.select {|k,v| !v['chef_node'].nil? && v['failure'].nil? }
+  end
 end

data/lib/chef/knife/nodefu_create.rb

@@ -6,13 +6,17 @@ class NodefuCreate < Chef::Knife
     require 'fileutils'
     require 'yaml'
     require 'thread'
+    require 'fog'
     Chef::Knife::Ec2ServerCreate.load_deps
+    Chef::Knife::Ec2ServerDelete.load_deps
   end
 
   include NodefuBase
 
   banner "knife nodefu create <server><range> (OPTIONS)"
 
+  attr_reader :servers
+
   option :node_spec,
          :short => "-n <node_spec>",
          :long => "--node_spec <node_spec>",
@@ -31,26 +35,49 @@ class NodefuCreate < Chef::Knife
          :description => "yml definitions file",
          :default => nil 
 
+  option :exit_on_fail,
+         :short => "-e",
+         :long => "--exit-on-fail",
+         :description => "Exit if one of the servers fails to come up",
+         :default => nil
+
+  option :destroy_on_fail,
+         :short => "-f",
+         :long => "--destroy-on-fail",
+         :description => "Terminate the ec2 instance on error",
+         :default => nil
+
+  def destroy_instances(servers)
+    ec2_delete = Ec2ServerDelete.new 
+    servers.each_pair.with_index do |(k,v),i| 
+      if v['server'].nil?
+        ui.msg("No server to delete for #{k}")
+      else
+        ec2_delete.name_args[i] = v['server'].id
+      end
+    end
+    ec2_delete.config[:yes] = true
+    ec2_delete.run 
+  end
+
   def run
+    check_args(1)
     env = Chef::Config[:environment]  
     definitions_file = config[:definitions_file].nil? ? Chef::Config[:nodefu_definitions_file] : config[:definitions_file] 
     @yml_config = YAML.load_file definitions_file
 
-    check_args(1)
-    servers = name_args[0]
-    base_name, start_range, end_range = parse_servers(servers)  
+    base_name, start_range, end_range = parse_servers(name_args[0])  
 
     #merge the current environment hash with the defaults
     merged_configuration = Chef::Mixin::DeepMerge.merge(@yml_config['default'],@yml_config['env'][env])
 
-    domain = merged_configuration['domain'] 
-
     if (! config[:node_spec].nil?)
       node_spec_name = config[:node_spec]
     else 
       node_spec_name = base_name 
     end
 
+    domain       = merged_configuration['domain'] 
     node_spec    = merged_configuration['node_spec'][node_spec_name]
     vm_spec_name = node_spec['vm_spec']
     vm_spec      = merged_configuration['vm_spec'][vm_spec_name]
@@ -67,27 +94,53 @@ class NodefuCreate < Chef::Knife
     config[:yes] ? user_response = 'yes' : user_response = ui.ask_question("Does this seem right to you? [y/n]").downcase
     abort("See ya!") unless (['yes','y',].include?(user_response))
 
-    threads = []
+    threads = []   
     for i in (start_range..end_range)
-      threads << Thread.new(i) do |id|
-        ec2_create = Ec2ServerCreate.new
-        node_name = "#{base_name}#{id}" 
-        
-        #A handeful of the Ec2ServerCreate command line options use a :proc field so I have to
-        #populate those by hand instead of simply passing a value to its config entry 
-        Chef::Config[:knife][:aws_ssh_key_id] = vm_spec['ssh_key']
-        Chef::Config[:knife][:image]          = vm_spec['ami']
-        Chef::Config[:knife][:region]         = vm_spec['region']
-        ec2_create.config[:chef_node_name]    = "#{node_name}.#{env}.#{domain}"
-        ec2_create.config[:run_list]          = node_spec['run_list']      
-        ec2_create.config[:flavor]            = vm_spec['type']
-        ec2_create.config[:security_groups]   = (generate_security_groups(node_name,env) + aux_groups).split(',') 
-        ec2_create.config[:ssh_user]          = vm_spec['user']
-        ec2_create.config[:availability_zone] = vm_spec['az']
-        ec2_create.config[:distro]            = vm_spec['bootstrap']    
-        ec2_create.run
-      end
+      ec2_server_request = Ec2ServerCreate.new
+      node_name = "#{base_name}#{i}"
+      full_node_name = "#{base_name}#{i}.#{env}.#{domain}"  
+      #A handfull of the Ec2ServerCreate command line options use a :proc field so I have to
+      #populate those by hand instead of simply passing a value to its config entry 
+      Chef::Config[:knife][:aws_ssh_key_id] = vm_spec['ssh_key']
+      Chef::Config[:knife][:image]          = vm_spec['ami']
+      Chef::Config[:knife][:region]         = vm_spec['region']
+      ec2_server_request.config[:chef_node_name]    = full_node_name
+      ec2_server_request.config[:run_list]          = node_spec['run_list']      
+      ec2_server_request.config[:flavor]            = vm_spec['type']
+      ec2_server_request.config[:security_groups]   = (generate_security_groups(node_name,env) + aux_groups).split(',') 
+      ec2_server_request.config[:ssh_user]          = vm_spec['user']
+      ec2_server_request.config[:availability_zone] = vm_spec['az']
+      ec2_server_request.config[:distro]            = vm_spec['bootstrap'] 
+      threads << Thread.new(full_node_name,ec2_server_request) do |full_node_name,request|
+        e = nil
+        begin 
+          request.run
+        rescue => e 
+          config[:exit_on_fail] ? raise(e) : puts("#{full_node_name}: #{e.message}")
+        end 
+        [full_node_name, { 'server' => request.server, 'failure' => e, 'chef_node' => nil} ]
+      end        
     end
     threads.each(&:join)
+
+    #Build a servers hash with the node names as they key from the object returned by the threads
+    @servers = threads.inject({}) {|hash,t| hash[t.value[0]] = t.value[1]; hash}
+
+    query = Chef::Search::Query.new
+    query.search('node',"name:#{base_name}*#{env}*") do |n|
+      @servers[n.name]['chef_node'] = n
+    end
+  
+    ui.msg('') 
+    ui.msg(ui.color('Failed Nodes:',:red))
+    failed = failed_nodes(@servers).each_pair { |k,v| ui.msg("#{k}: #{v['failure']}") }
+
+    ui.msg(ui.color('Successful Nodes:',:green))
+    successful = successful_nodes(@servers).each_pair { |k,v| ui.msg("#{k}: #{v['id']}, #{v['dns_name']}") }
+
+    if config[:destroy_on_fail]
+      ui.msg(ui.color("Destroying failed nodes:",:red))
+      destroy_instances(failed)       
+    end
   end 
 end

data/lib/chef/knife/nodefu_destroy.rb

@@ -7,13 +7,14 @@ class NodefuDestroy < Chef::Knife
     require 'chef/api_client'
     require 'chef/node'
     require 'chef/json_compat'
+    require 'chef/search/query'
     require 'thread'
     Chef::Knife::Ec2ServerDelete.load_deps
   end
 
   include NodefuBase
 
-  banner "knife nodefu destroy <name>|<name>[range]"
+  banner "knife nodefu destroy QUERY (options)"
 
   option :yes,
          :short => "-y",
@@ -41,13 +42,13 @@ class NodefuDestroy < Chef::Knife
 
   def run
     check_args(1)
-    matcher = /#{name_args[0]}/  
 
-    all_clients = Chef::ApiClient.list(true) 
-    all_nodes = Chef::Node.list
-
-    nodes_to_delete = all_nodes.inject({}) { |nodes, (k,v)| nodes[k] = Chef::Node.load(k) if k =~ matcher; nodes } 
-    clients_to_delete = all_clients.inject({}) { |clients, (k, v)| clients[k] = v if k =~ matcher; clients }   
+    nodes_to_delete, clients_to_delete = {},{}
+    query = Chef::Search::Query.new
+    query.search('node',name_args[0]) do |node|
+      nodes_to_delete[node.name] = node
+      clients_to_delete[node.name] = Chef::ApiClient.load(node.name)
+    end
 
     #Display all the items that will be removed   
     if config[:skip_clients]
@@ -68,9 +69,9 @@ class NodefuDestroy < Chef::Knife
       ui.msg("#{ui.color('Skipping instances...',:cyan)}")    
     else
       ui.msg("#{ui.color('EC2 instances to be terminated:',:red)}") 
-      nodes_to_delete.each do |node|
-        instance_id = node[1]['ec2']['instance_id']
-        ui.msg("#{ui.color(node[0],:magenta)}: #{instance_id}")
+      nodes_to_delete.each_pair do |name,node|
+        instance_id = node['ec2']['instance_id']
+        ui.msg("#{ui.color(name,:magenta)}: #{instance_id}")
       end
     end
     
@@ -80,14 +81,11 @@ class NodefuDestroy < Chef::Knife
     unless config[:skip_instances]
       threads = []
       #Delete the ec2 server
-      for i in nodes_to_delete
-        threads << Thread.new(i) do |node|      
+      nodes_to_delete.each_pair do |name,node|
          ec2_delete = Ec2ServerDelete.new 
-         instance_id = node[1]['ec2']['instance_id']
-         ec2_delete.name_args[0] = instance_id
+         ec2_delete.name_args[0] = node['ec2']['instance_id']
          ec2_delete.config[:yes] = true
-         ec2_delete.run
-        end
+         threads << Thread.new(node) { |node| ec2_delete.run }
       end 
       threads.each(&:join)
     end

data/lib/knife-nodefu/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Nodefu
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
     MAJOR, MINOR, TINY = VERSION.split(',')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-nodefu
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000Z
+date: 2012-05-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-ec2
-  requirement: &70111068734520 !ruby/object:Gem::Requirement
+  requirement: &70184212905400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70111068734520
+  version_requirements: *70184212905400
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70111068734020 !ruby/object:Gem::Requirement
+  requirement: &70184212904900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0.10'
   type: :runtime
   prerelease: false
-  version_requirements: *70111068734020
+  version_requirements: *70184212904900
 description: A knife plugin for simple node creation automation
 email:
 - brian.bianco@gmail.com