chef_client.rb in cucumber-chef-2.1.0.rc.4

- old
+ new

@@ -58,10 +58,11 @@
     (command_run_chroot(name, "/bin/rm -fv #{Cucumber::Chef::Config[:artifacts].values.join(' ')}") rescue nil)
 
     logger.info { "Running chef client on container '#{name}'." }
 
     arguments = {
+      "--node-name" => name,
       "--json-attributes" => File.join("/etc", "chef", "attributes.json").to_s,
       "--log_level" => (ENV['LOG_LEVEL'] || "INFO").downcase
     }.reject{ |k,v| v.nil? }.sort
 
     output = nil
@@ -78,21 +79,26 @@
   def chef_config_client(name)
     # make sure our configuration location is there
     client_rb = File.join("/", container_root(name), "etc/chef/client.rb")
     FileUtils.mkdir_p(File.dirname(client_rb))
 
-    max_key_size = @chef_client_config.keys.collect{ |z| z.to_s.size }.max
+    # Do not render out a chef-client config for now; we'll assume the user will
+    # use a cookbook/recipe to accomplish this to their liking.
 
-    File.open(client_rb, 'w') do |f|
-      f.puts(Cucumber::Chef.generate_do_not_edit_warning("Chef Client Configuration"))
-      f.puts
-      @chef_client_config.merge(:node_name => name).each do |(key,value)|
-        next if value.nil?
-        f.puts("%-#{max_key_size}s  %s" % [key, value.inspect])
-      end
-      f.puts
-      f.puts("Mixlib::Log::Formatter.show_time = true")
-    end
+    # File.exists?(client_rb) && File.delete(client_rb)
+
+    # max_key_size = @chef_client_config.keys.collect{ |z| z.to_s.size }.max
+
+    # File.open(client_rb, 'w') do |f|
+    #   f.puts(Cucumber::Chef.generate_do_not_edit_warning("Chef Client Configuration"))
+    #   f.puts
+    #   @chef_client_config.merge(:node_name => name).each do |(key,value)|
+    #     next if value.nil?
+    #     f.puts("%-#{max_key_size}s  %s" % [key, value.inspect])
+    #   end
+    #   f.puts
+    #   f.puts("Mixlib::Log::Formatter.show_time = true")
+    # end
 
     attributes_json = File.join("/", container_root(name), "etc", "chef", "attributes.json")
     FileUtils.mkdir_p(File.dirname(attributes_json))
     File.open(attributes_json, 'w') do |f|
       f.puts((@containers[name][:chef_client] || {}).to_json)