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

fixed warnings about missing folders for Chef Solo and Zero

This commit is contained in:
Eugenio Marzo 2017-08-01 20:36:38 +02:00
parent c9b65bd129
commit 7e436c6971
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/provisioners/chef/provisioner/chef_solo.rb
View File

@ -87,7 +87,8 @@ module VagrantPlugins
key = Digest::MD5.hexdigest(local_path) key = Digest::MD5.hexdigest(local_path)
remote_path = "#{guest_provisioning_path}/#{key}" remote_path = "#{guest_provisioning_path}/#{key}"
else else
@machine.ui.warn(I18n.t("vagrant.provisioners.chef.cookbook_folder_not_found_warning", appended_folder = "cookbooks" if appended_folder.nil?
@machine.ui.warn(I18n.t("vagrant.provisioners.chef.#{appended_folder}_folder_not_found_warning",
path: local_path.to_s)) path: local_path.to_s))
next next
end end

10
templates/locales/en.yml
View File

@ -2160,8 +2160,16 @@ en:
The chef binary (either `chef-solo` or `chef-client`) was not found on The chef binary (either `chef-solo` or `chef-client`) was not found on
the VM and is required for chef provisioning. Please verify that chef the VM and is required for chef provisioning. Please verify that chef
is installed and that the binary is available on the PATH. is installed and that the binary is available on the PATH.
cookbook_folder_not_found_warning: cookbooks_folder_not_found_warning:
"The cookbook path '%{path}' doesn't exist. Ignoring..." "The cookbook path '%{path}' doesn't exist. Ignoring..."
nodes_folder_not_found_warning:
"The node path '%{path}' doesn't exist. Ignoring..."
data_bags_folder_not_found_warning:
"The databag path '%{path}' doesn't exist. Ignoring..."
roles_folder_not_found_warning:
"The role path '%{path}' doesn't exist. Ignoring..."
environments_folder_not_found_warning:
"The environment path '%{path}' doesn't exist. Ignoring..."
json: "Generating chef JSON and uploading..." json: "Generating chef JSON and uploading..."
client_key_folder: "Creating folder to hold client key..." client_key_folder: "Creating folder to hold client key..."
generating_node_name: |- generating_node_name: |-