knife-nodefu 0.3.1 → 0.4.1

data/README.rdoc

@@ -13,7 +13,14 @@ gem install knife-nodefu
 = Definitions File Directory
 
 This file provides all the proper definitions for nodefu to be able to easily build out servers.  You can either pass in the definitions file directory with the -d option, or set the following option in your knife.rb file.
- 
+
+NOTE: VPC Mode is enabled when setting a Private IP
+
+LIMITATIONS:
+- Range is not supported when an Elastic IP or Private IP is set
+- VPC instances require an elastic_ip_address and server_connect_attribute to be set to: public_ip_address
+- VPC instances require group_ids, they don't support generated groups or aux_groups
+
 nodefu_definitions "Path to directory"
 
 Example definitions yml file:
@@ -35,6 +42,17 @@ default:
       vm_spec: 'm1.large'
       run_list:
         - 'role[noodle]'
+    vpc_noodle:
+      vm_spec: 'm1.large'
+      run_list:
+        - 'role[noodle]'
+      subnet_id: 'subnet-00000000'
+      private_ip_address: ###.###.###.###
+      elastic_ip_address: ###.###.###.###
+      group_ids:
+        - 'sg-00000000'
+        - 'sg-00000000' 
+      server_connect_attribute: public_ip_address
 env:
   production:
   staging: 

data/lib/chef/knife/nodefu_base.rb

@@ -14,7 +14,7 @@ module NodefuBase
     else
       ["node_#{env}_#{name}","default_#{env}","default"]
     end
-end
+  end
 
   def check_args(size)
     if name_args.size < 1
@@ -41,4 +41,8 @@ end
   def successful_nodes(servers)
     servers.select {|k,v| !v['chef_node'].nil? && v['failure'].nil? }
   end
+
+  def is_vpc?(node_spec)
+    node_spec['subnet_id'] || node_spec['private_ip_address'] ? true : false
+  end
 end

data/lib/chef/knife/nodefu_create.rb

@@ -32,22 +32,23 @@ class NodefuCreate < Chef::Knife
 
   option :disable_default_groups,
          :short => "-g",
-         :long => "--disable_default-groups",
+         :long => "--disable-default-groups",
          :boolean => true,
+         :description => "Disable auto generated default security groups (ignored in VPC mode)",
          :default => false
 
   option :hostname_style_groups,
          :short => "-h",
          :long => "--hostname-style-groups",
          :boolean => true,
-         :description => "Use hostname style names for auto generated node security groups",
+         :description => "Use hostname style names for auto generated node security groups (ignored in VPC mode)",
          :default => false
 
   option :definitions_file,
          :short => "-d <definitions_directory>",
          :long => "--definitions_dir <definitions_directory>",
          :description => "yml definitions directory",
-         :default => nil 
+         :default => nil
 
   def definitions_from_directory(dir)
     definitions = Hash.new
@@ -66,30 +67,33 @@ class NodefuCreate < Chef::Knife
     
     base_name, start_range, end_range = parse_servers(name_args[0])  
 
-    env            = Chef::Config[:environment]  
-    defs_dir       = Chef::Config[:nodefu_definitions] || config[:definitions] 
-    yml_config     = definitions_from_directory defs_dir
-    merged_config  = Chef::Mixin::DeepMerge.merge(yml_config['default'],yml_config['env'][env])
-    node_spec_name = config[:node_spec] || base_name 
+    env                = Chef::Config[:environment]  
+    defs_dir           = Chef::Config[:nodefu_definitions] || config[:definitions] 
+    yml_config         = definitions_from_directory defs_dir
+    merged_config      = Chef::Mixin::DeepMerge.merge(yml_config['default'], yml_config['env'][env])
+    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])
 
-    domain           = merged_config['domain'] 
-    vm_spec_name     = node_spec['vm_spec']
-    vm_spec          = merged_config['vm_spec'][vm_spec_name]
-    aux_groups       = if node_spec['aux_groups'].nil?
-                         []
-                       else
-                         node_spec['aux_groups']
-                       end
+    domain             = merged_config['domain'] 
+    vm_spec_name       = node_spec['vm_spec']
+    vm_spec            = merged_config['vm_spec'][vm_spec_name]
+    group_ids          = node_spec['group_ids'] ||= []
+    aux_groups         = node_spec['aux_groups'] ||= []    
+
+    elastic_ip_address = node_spec['elastic_ip_address']
+    private_ip_address = node_spec['private_ip_address']
+    abort("Range isn't supported when a private_ip_address or an elastic_ip_address is set, please only create one instance") unless start_range == end_range
+    abort('private_ip_address option uses VPC mode, which requires a subnet_id in the definitions file for the node_spec]') if private_ip_address && node_spec['subnet_id'].nil?
 
     # 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:")
     ui.msg("#{ui.color('Base Name',:cyan)}: #{base_name}")
     ui.msg("#{ui.color('Node Spec',:cyan)}: #{node_spec_name}")
+    ui.msg("#{ui.color('VPC Mode',:cyan)}: #{is_vpc?(node_spec)}")
     pretty_print_hash(node_spec)
     pretty_print_hash(vm_spec)
  
-    unless config[:disable_default_groups]
+    unless config[:disable_default_groups] || is_vpc?(node_spec)
       ui.msg("#{ui.color('Auto generated security groups',:cyan)}: #{generate_security_groups("#{base_name}#{start_range}-#{end_range}",env,domain)}")
     end
 
@@ -106,22 +110,29 @@ class NodefuCreate < Chef::Knife
                           aux_groups
                         else
                           generate_security_groups(node_name,env,domain) + aux_groups 
-                        end
+                        end unless is_vpc?(node_spec)
+      security_group_ids = group_ids
 
       # 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]   = 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'] 
+      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]           = security_groups if security_groups
+      ec2_server_request.config[:security_group_ids]        = security_group_ids if security_group_ids
+      ec2_server_request.config[:associate_eip]             = elastic_ip_address if elastic_ip_address
+      ec2_server_request.config[:subnet_id]                 = node_spec['subnet_id'] if node_spec['subnet_id']
+      ec2_server_request.config[:private_ip_address]        = private_ip_address if private_ip_address
+      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']
+      ec2_server_request.config[:server_connect_attribute]  = node_spec['server_connect_attribute'] if node_spec['server_connect_attribute']
+      ec2_server_request.config[:environment]               = Chef::Config[:environment]
       threads << Thread.new(full_node_name,ec2_server_request) do |full_node_name,request|
         e = nil
         begin 

data/lib/knife-nodefu/version.rb

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