Adding node name override to chef-client

Author: adamhjk

chef-server/lib/controllers/openid_register.rb

@@ -54,9 +54,15 @@ def create
     @registered_node = Chef::OpenIDRegistration.new
     @registered_node.name = params[:id]
     @registered_node.set_password(params[:password])
-    if params[:validation_token] == Chef::Config[:validation_token]
-      @registered_node.validated = true
-    end  
+    if Chef::Config[:validation_token]
+      if params[:validation_token] == Chef::Config[:validation_token]
+        @registered_node.validated = true
+      else
+        @registered_node.validated = false
+      end
+    else
+      @registered_node.validated = false
+    end
     @registered_node.save
     display @registered_node
   end

chef/bin/chef-client

@@ -29,7 +29,8 @@ config = {
   :log_level => :info,
   :json_attribs => nil,
   :noop => false,
-  :validation_token => nil
+  :validation_token => nil,
+  :node_name => nil
 }
 opts = OptionParser.new do |opts|
   opts.banner = "Usage: #{$0} [-d DIR|-r FILE] (options)"
@@ -39,6 +40,9 @@ opts = OptionParser.new do |opts|
   opts.on("-j JSON_ATTRIBS", "--json-attributes JSON_ATTRIBS", "Load attributes from a JSON file") do |j|
     config[:json_attribs] = j
   end
+  opts.on("-N NODE_NAME", "--node-name NODE_NAME", "The node name for this client") do |n|
+    config[:node_name] = n
+  end
   opts.on("-n", "--noop", "Print what you would do, but don't actually do it.") do
     config[:noop] = true
   end
@@ -70,8 +74,6 @@ if config[:json_attribs]
   config[:json_attribs] = JSON.parse(IO.read(config[:json_attribs]))
 end
 
-
-
 # Load our config file
 Chef::Config.from_file(config[:config_file])
 if config[:log_level]
@@ -81,4 +83,5 @@ end
 c = Chef::Client.new
 c.json_attribs = config[:json_attribs]
 c.validation_token = config[:validation_token]
+c.node_name = config[:node_name]
 c.run

chef/lib/chef/client.rb

@@ -28,7 +28,7 @@ class Client
     include Chef::Mixin::GenerateURL
     include Chef::Mixin::Checksum
 
-    attr_accessor :node, :registration, :safe_name, :json_attribs, :validation_token
+    attr_accessor :node, :registration, :safe_name, :json_attribs, :validation_token, :node_name
 
     # Creates a new Chef::Client.
     def initialize()
@@ -37,6 +37,7 @@ def initialize()
       @validation_token = nil
       @registration = nil
       @json_attribs = nil
+      @node_name = nil
       @rest = Chef::REST.new(Chef::Config[:registration_url])
     end
 
@@ -58,7 +59,7 @@ def run
       start_time = Time.now
       Chef::Log.info("Starting Chef Run")
 
-      build_node
+      build_node(@node_name)
       register
       authenticate
       sync_library_files

chef/lib/chef/config.rb

@@ -56,6 +56,7 @@ class Config
       :openid_store_path => "/var/chef/openid/db",
       :openid_cstore_path => "/var/chef/openid/cstore",
       :file_cache_path => "/var/chef/cache",
+      :node_name => nil,
       :executable_path => ENV['PATH'] ? ENV['PATH'].split(File::PATH_SEPARATOR) : []
     }
 

chef/spec/unit/provider/template_spec.rb

@@ -133,7 +133,6 @@ def do_action_create
 end
 
 describe Chef::Provider::Template, "generate_url" do
-  
   before(:each) do
     @resource = Chef::Resource::Template.new("seattle")
     @resource.cookbook_name = "daft"