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

provisioners/chef: use command -v to check for binary [GH-5167]

This commit is contained in:
Mitchell Hashimoto 2015-02-24 10:11:05 -08:00
parent e9b00972b0
commit c1e2d36090
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -33,6 +33,8 @@ BUG FIXES:
- provisioners/ansible: fix SSH settings to support more than 5 ssh keys [GH-5017] - provisioners/ansible: fix SSH settings to support more than 5 ssh keys [GH-5017]
- provisioners/ansible: increase ansible connection timeout to 30 seconds [GH-5018] - provisioners/ansible: increase ansible connection timeout to 30 seconds [GH-5018]
- provisioners/docker: Only add docker user to group if exists. [GH-5315] - provisioners/docker: Only add docker user to group if exists. [GH-5315]
- provisioners/chef: Use `command -v` to check for binary instead of
`which` since that doesn't exist on some systems. [GH-5170]
- provisioners/chef-zero: support more chef-zero/local mode attributes [GH-5339] - provisioners/chef-zero: support more chef-zero/local mode attributes [GH-5339]
- provisioners/docker: use docker.com instead of docker.io [GH-5216] - provisioners/docker: use docker.com instead of docker.io [GH-5216]
- pushes/atlas: send additional box metadata [GH-5283] - pushes/atlas: send additional box metadata [GH-5283]

2
plugins/provisioners/chef/provisioner/base.rb
View File

@ -38,7 +38,7 @@ module VagrantPlugins
# Checks for the existence of chef binary and error if it # Checks for the existence of chef binary and error if it
# doesn't exist. # doesn't exist.
@machine.communicate.sudo( @machine.communicate.sudo(
"which #{binary}", "sh -c 'which #{binary}'",
error_class: ChefError, error_class: ChefError,
error_key: :chef_not_detected, error_key: :chef_not_detected,
binary: binary, binary: binary,