haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2058 from miketheman/chef_formatter_part_deux 

provisioner/chef: fix formatter to work for Chef 10 and 11
This commit is contained in:
Mitchell Hashimoto 2013-08-28 16:37:37 -07:00
parent 7b21b42330 a90ad18058
commit 42f30fc501
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/provisioners/chef_client/client.erb
View File

@ -33,7 +33,7 @@ pid_file "/var/run/chef/chef-client.pid"
Mixlib::Log::Formatter.show_time = true Mixlib::Log::Formatter.show_time = true
<% if formatter %> <% if formatter %>
formatter "<%= formatter %>" add_formatter "<%= formatter %>"
<% end %> <% end %>
<% if custom_configuration -%> <% if custom_configuration -%>

2
templates/provisioners/chef_solo/solo.erb
View File

@ -29,7 +29,7 @@ https_proxy_pass <%= https_proxy_pass.inspect %>
no_proxy <%= no_proxy.inspect %> no_proxy <%= no_proxy.inspect %>
<% if formatter %> <% if formatter %>
formatter "<%= formatter %>" add_formatter "<%= formatter %>"
<% end %> <% end %>
<% if custom_configuration -%> <% if custom_configuration -%>