ubuntu10.04-gems.erb in chef-0.10.0.rc.1

- old
+ new

@@ -8,41 +8,30 @@
   cd rubygems-1.3.7
   ruby setup.rb --no-format-executable
 fi
 
 gem install ohai --no-rdoc --no-ri --verbose
-gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string(:gems) %>
+gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string %>
 
 mkdir -p /etc/chef
 
 (
 cat <<'EOP'
-<%= IO.read(Chef::Config[:validation_key]) %>
+<%= validation_key %>
 EOP
 ) > /tmp/validation.pem
 awk NF /tmp/validation.pem > /etc/chef/validation.pem
 rm /tmp/validation.pem
 
 (
 cat <<'EOP'
-log_level        :info
-log_location     STDOUT
-chef_server_url  "<%= Chef::Config[:chef_server_url] %>"
-validation_client_name "<%= Chef::Config[:validation_client_name] %>"
-<% if @config[:chef_node_name] == nil %>
-# Using default node name (fqdn)
-<% else %>
-node_name "<%= @config[:chef_node_name] %>"
-<% end %>
-<% if Chef::Config[:environment] != nil %>
-environment "<%= Chef::Config[:environment]%>"
-<% end %>
+<%= config_content %>
 EOP
 ) > /etc/chef/client.rb
 
 (
 cat <<'EOP'
 <%= { "run_list" => @run_list }.to_json %>
 EOP
 ) > /etc/chef/first-boot.json
 
-/usr/bin/chef-client -j /etc/chef/first-boot.json'
+<%= start_chef %>'