diff options
| author | Daniel DeLeo <dan@opscode.com> | 2011-04-27 13:38:25 -0700 |
|---|---|---|
| committer | Daniel DeLeo <dan@opscode.com> | 2011-04-27 13:40:45 -0700 |
| commit | 48357c58bdfc70f0ae0465b11ae1f809915c4bd5 (patch) | |
| tree | 262330047529a5f9fb8f75014b1d1a33d060365a /chef | |
| parent | cc0d574cee2a92f768c15b44eb57b9254c97ffc6 (diff) | |
| download | chef-48357c58bdfc70f0ae0465b11ae1f809915c4bd5.tar.gz | |
[CHEF-2219] convert fedora to use new context object
Diffstat (limited to 'chef')
| -rw-r--r-- | chef/lib/chef/knife/bootstrap/fedora13-gems.erb | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/chef/lib/chef/knife/bootstrap/fedora13-gems.erb b/chef/lib/chef/knife/bootstrap/fedora13-gems.erb index 217882ae82..9318eed258 100644 --- a/chef/lib/chef/knife/bootstrap/fedora13-gems.erb +++ b/chef/lib/chef/knife/bootstrap/fedora13-gems.erb @@ -4,13 +4,13 @@ yum install -y ruby ruby-devel gcc gcc-c++ automake autoconf rubygems make gem update --system gem update 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 @@ -18,15 +18,7 @@ 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" -<% else %> -node_name "<%= @config[:chef_node_name] %>" -<% end %> +<%= config_content %> EOP ) > /etc/chef/client.rb @@ -36,4 +28,4 @@ cat <<'EOP' EOP ) > /etc/chef/first-boot.json -/usr/bin/chef-client -j /etc/chef/first-boot.json' +<%= start_chef %>' |