knife-nodefu 0.1.2 → 0.2.0

data/lib/chef/knife/nodefu_base.rb

@@ -9,7 +9,7 @@ module NodefuBase
   end
 
   def generate_security_groups(name,env)
-    "node_#{env}_#{name},default_#{env},default"  
+    ["node_#{env}_#{name}","default_#{env}","default"]
   end
 
   def check_args(size)

data/lib/chef/knife/nodefu_create.rb

@@ -28,7 +28,13 @@ class NodefuCreate < Chef::Knife
          :long => "--yes",
          :description => "ignores prompts, just say YES!",
          :default => nil
-  
+
+  option :no_default_groups,
+         :short => "-g",
+         :long => "--no-groups",
+         :description => "Do not automatically generate security groups",
+         :default => nil
+
   option :definitions_file,
          :short => "-d <definitions_directory>",
          :long => "--definitions_dir <definitions_directory>",
@@ -74,6 +80,8 @@ class NodefuCreate < Chef::Knife
 
   def run
     check_args(1)
+    
+    base_name, start_range, end_range = parse_servers(name_args[0])  
 
     env            = Chef::Config[:environment]  
     defs_dir       = Chef::Config[:nodefu_definitions] || config[:definitions] 
@@ -82,12 +90,10 @@ class NodefuCreate < Chef::Knife
     node_spec_name = config[:node_spec] || base_name 
     abort("I'm sorry I couldn't find any node_spec matches :(") unless (node_spec = merged_config['node_spec'][node_spec_name])
 
-    base_name, start_range, end_range = parse_servers(name_args[0])  
-
-    domain       = merged_config['domain'] 
-    vm_spec_name = node_spec['vm_spec']
-    vm_spec      = merged_config['vm_spec'][vm_spec_name]
-    aux_groups   = node_spec['aux_groups'].nil? ? '' : ",#{node_spec['aux_groups'].join(',')}"
+    domain           = merged_config['domain'] 
+    vm_spec_name     = node_spec['vm_spec']
+    vm_spec          = merged_config['vm_spec'][vm_spec_name]
+    aux_groups       = node_spec['aux_groups']
 
     # Present the user with some totally rad visuals!!!
     ui.msg("#{ui.color('SHAZAM!',:red)} It looks like you want to launch #{ui.color((end_range - start_range + 1).to_s,:yellow)} of these:")
@@ -95,8 +101,11 @@ class NodefuCreate < Chef::Knife
     ui.msg("#{ui.color('Node Spec',:cyan)}: #{node_spec_name}")
     pretty_print_hash(node_spec)
     pretty_print_hash(vm_spec)
-    ui.msg("#{ui.color('Auto generated security groups',:cyan)}: #{generate_security_groups("#{base_name}#{start_range}-#{end_range}",env)}")
  
+    if config[:no_default_groups].nil?
+      ui.msg("#{ui.color('Auto generated security groups',:cyan)}: #{generate_security_groups("#{base_name}#{start_range}-#{end_range}",env)}")
+    end
+
     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))
 
@@ -105,19 +114,30 @@ class NodefuCreate < Chef::Knife
     for i in (start_range..end_range)
       ec2_server_request = Ec2ServerCreate.new
       node_name = "#{base_name}#{i}"
-      full_node_name = "#{base_name}#{i}.#{env}.#{domain}"  
+      full_node_name  = "#{node_name}.#{env}.#{domain}"  
+      security_groups = if config[:no_default_groups].nil?
+                          generate_security_groups(node_name,env) + aux_groups 
+                        else
+                          aux_groups
+                        end
+
+      puts security_groups.inspect
+
       # 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[:image]             = vm_spec['ami']
+      ec2_server_request.config[: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[:security_groups]   = security_groups 
       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'] 
+      puts ec2_server_request.config.inspect
       threads << Thread.new(full_node_name,ec2_server_request) do |full_node_name,request|
         e = nil
         begin 

data/lib/chef/knife/nodefu_destroy.rb

@@ -16,30 +16,19 @@ class NodefuDestroy < Chef::Knife
 
   banner "knife nodefu destroy QUERY (options)"
 
+#  option :purge,
+#         :short => "-P",
+#         :long => "--purge",
+#         :boolean => true,
+#         :default => false,
+#         :description => ""
+
   option :yes,
          :short => "-y",
          :long => "--yes",
          :description => "ignores prompts, just say YES!",
          :default => nil
 
-  option :skip_clients,
-         :short => "-c",
-         :long => "--skip-clients",
-         :description => "Do not delete clients",
-         :default => nil
-
-  option :skip_nodes,
-         :short => "-n",
-         :long => "--skip-nodes",
-         :description => "Do not delete nodes",
-         :default => nil
-
-   option :skip_instances,
-          :short => "-i",
-          :long => "--skip-instances",
-          :description => "Do not terminate instances",
-          :default => nil
-
   def run
     check_args(1)
 
@@ -50,58 +39,31 @@ class NodefuDestroy < Chef::Knife
       clients_to_delete[node.name] = Chef::ApiClient.load(node.name)
     end
 
-    #Display all the items that will be removed   
-    if config[:skip_clients]
-      ui.msg("#{ui.color('Skipping clients...',:cyan)}")   
-    else
-      ui.msg("#{ui.color('Clients to be deleted:',:red)}")
-      pretty_print_hash clients_to_delete
-    end
+    ui.msg("#{ui.color('Clients to be deleted:',:red)}")
+    pretty_print_hash clients_to_delete
 
-    if config[:skip_nodes]
-      ui.msg("#{ui.color('Skipping nodes...',:cyan)}")    
-    else
-      ui.msg("#{ui.color('Nodes to be deleted:',:red)}")
-      pretty_print_hash nodes_to_delete
-    end
+    ui.msg("#{ui.color('Nodes to be deleted:',:red)}")
+    pretty_print_hash nodes_to_delete
 
-    if config[:skip_instances]
-      ui.msg("#{ui.color('Skipping instances...',:cyan)}")    
-    else
-      ui.msg("#{ui.color('EC2 instances to be terminated:',:red)}") 
-      nodes_to_delete.each_pair do |name,node|
-        instance_id = node['ec2']['instance_id']
-        ui.msg("#{ui.color(name,:magenta)}: #{instance_id}")
-      end
+    ui.msg("#{ui.color('EC2 instances to be terminated:',:red)}") 
+    nodes_to_delete.each_pair do |name,node|
+      instance_id = node['ec2']['instance_id']
+      ui.msg("#{ui.color(name,:magenta)}: #{instance_id}")
     end
     
     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))
 
-    unless config[:skip_instances]
-      threads = []
-      #Delete the ec2 server
-      nodes_to_delete.each_pair do |name,node|
-         ec2_delete = Ec2ServerDelete.new 
-         ec2_delete.name_args[0] = node['ec2']['instance_id']
-         ec2_delete.config[:yes] = true
-         threads << Thread.new(node) { |node| ec2_delete.run }
-      end 
-      threads.each(&:join)
-    end
-
-    unless config[:skip_nodes]
-      nodes_to_delete.each_pair do |node_name,node_object|
-        ui.msg("#{ui.color('destroying node:',:red)} #{node_name}")
-        node_object.destroy
-      end
-    end
-
-    unless config[:skip_clients]
-      clients_to_delete.each_pair do |client_name,client_object|         
-        ui.msg("#{ui.color('destroying client:',:red)} #{client_name}")
-        client_object.destroy
-      end
-    end
+    threads = []
+    #Delete the ec2 server
+    nodes_to_delete.each_pair do |name,node|
+       ec2_delete = Ec2ServerDelete.new 
+       ec2_delete.name_args[0] = node['ec2']['instance_id']
+       ec2_delete.config[:chef_node_name] = name
+       ec2_delete.config[:purge] = true
+       ec2_delete.config[:yes] = true
+       threads << Thread.new(node) { |node| ec2_delete.run }
+    end 
+    threads.each(&:join)
   end
 end

data/lib/knife-nodefu/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Nodefu
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
     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.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-ec2