provisioners/chef: Fix loading of the custom configure file [GH-876]

This commit is contained in:
Teemu Matilainen 2014-02-20 15:16:23 -03:00
parent 5289261cc0
commit fe1f7bf149
3 changed files with 3 additions and 2 deletions

View File

@ -98,6 +98,7 @@ BUG FIXES:
machine before and after provisioning also with Chef client. [GH-2845]
- provisioners/chef: Set `encrypted_data_bag_secret` on the VM to `nil`
if the secret is not specified. [GH-2984]
- provisioners/chef: Fix loading of the custom configure file. [GH-876]
- provisioners/docker: Only add SSH user to docker group if the user
isn't already in it. [GH-2838]
- provisioners/docker: Configuring autostart works properly with

View File

@ -37,5 +37,5 @@ add_formatter "<%= formatter %>"
<% end %>
<% if custom_configuration -%>
load "<%= custom_configuration %>"
Chef::Config.from_file "<%= custom_configuration %>"
<% end -%>

View File

@ -41,5 +41,5 @@ add_formatter "<%= formatter %>"
<% end %>
<% if custom_configuration -%>
load "<%= custom_configuration %>"
Chef::Config.from_file "<%= custom_configuration %>"
<% end -%>