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

Append folder name to chef solo cookbooks [GH-511]

This commit is contained in:
Mitchell Hashimoto 2011-11-30 14:54:55 -08:00
parent 27c83aef16
commit 723b3c06fb
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/vagrant/provisioners/chef_solo.rb
View File

@ -36,9 +36,9 @@ module Vagrant
attr_reader :data_bags_folders
def prepare
@cookbook_folders = expanded_folders(config.cookbooks_path)
@role_folders = expanded_folders(config.roles_path)
@data_bags_folders = expanded_folders(config.data_bags_path)
@cookbook_folders = expanded_folders(config.cookbooks_path, "cookbooks")
@role_folders = expanded_folders(config.roles_path, "roles")
@data_bags_folders = expanded_folders(config.data_bags_path, "data_bags")
share_folders("csc", @cookbook_folders)
share_folders("csr", @role_folders)
@ -54,7 +54,7 @@ module Vagrant
end
# Converts paths to a list of properly expanded paths with types.
def expanded_folders(paths)
def expanded_folders(paths, appended_folder=nil)
return [] if paths.nil?
# Convert the path to an array if it is a string or just a single
@ -85,6 +85,9 @@ module Vagrant
remote_path = remote_path.gsub(/^[a-zA-Z]:/, "")
end
# If we have specified a folder name to append then append it
remote_path += "/#{appended_folder}" if appended_folder
# Return the result
[type, local_path, remote_path]
end