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

provisioners/chef: env config less restrictive

This commit is contained in:
Mitchell Hashimoto 2013-09-05 16:34:21 -07:00
parent e05cca7ed4
commit a06742b8ef
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -7,6 +7,7 @@ BUG FIXES:
- core: `VAGRANT_VAGRANTFILE` env var only applies to the project - core: `VAGRANT_VAGRANTFILE` env var only applies to the project
Vagrantfile name. [GH-2130] Vagrantfile name. [GH-2130]
- provisioners/chef: Work even with restrictive umask on user. [GH-2121] - provisioners/chef: Work even with restrictive umask on user. [GH-2121]
- provisioners/chef: Fix environment validation to be less restrictive.
- provisioners/puppet: No more "shared folders cannot be found" error. - provisioners/puppet: No more "shared folders cannot be found" error.
[GH-2134] [GH-2134]
- provisioners/puppet: Work with restrictive umask on user by testing - provisioners/puppet: Work with restrictive umask on user by testing

5
plugins/provisioners/chef/config/chef_solo.rb
View File

@ -46,7 +46,8 @@ module VagrantPlugins
@data_bags_path = [] if @data_bags_path == UNSET_VALUE @data_bags_path = [] if @data_bags_path == UNSET_VALUE
@roles_path = [] if @roles_path == UNSET_VALUE @roles_path = [] if @roles_path == UNSET_VALUE
@environments_path = [] if @environments_path == UNSET_VALUE or @recipe_url == nil @environments_path = [] if @environments_path == UNSET_VALUE
@environments_path = [@environments_path].flatten
# Make sure the path is an array. # Make sure the path is an array.
@cookbooks_path = prepare_folders_config(@cookbooks_path) @cookbooks_path = prepare_folders_config(@cookbooks_path)
@ -67,7 +68,7 @@ module VagrantPlugins
errors << I18n.t("vagrant.config.chef.cookbooks_path_empty") if \ errors << I18n.t("vagrant.config.chef.cookbooks_path_empty") if \
!cookbooks_path || [cookbooks_path].flatten.empty? !cookbooks_path || [cookbooks_path].flatten.empty?
errors << I18n.t("vagrant.config.chef.environment_path_required") if \ errors << I18n.t("vagrant.config.chef.environment_path_required") if \
environment and (!environments_path || [environments_path].flatten.empty?) environment && environments_path.empty?)
{ "chef solo provisioner" => errors } { "chef solo provisioner" => errors }
end end