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

Give cookbooks and role shared folders unique IDs

This commit is contained in:
Mitchell Hashimoto 2010-04-09 14:22:05 -07:00
parent a9c261090e
commit 4586bc554d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,13 +16,13 @@ module Vagrant
def share_cookbook_folders def share_cookbook_folders
host_cookbook_paths.each_with_index do |cookbook, i| host_cookbook_paths.each_with_index do |cookbook, i|
env.config.vm.share_folder("vagrant-chef-solo-#{i}", cookbook_path(i), cookbook) env.config.vm.share_folder("vagrant-chef-solo-cookbooks-#{i}", cookbook_path(i), cookbook)
end end
end end
def share_role_folders def share_role_folders
host_role_paths.each_with_index do |role, i| host_role_paths.each_with_index do |role, i|
env.config.vm.share_folder("vagrant-chef-solo-#{i}", role_path(i), role) env.config.vm.share_folder("vagrant-chef-solo-roles-#{i}", role_path(i), role)
end end
end end

4
test/vagrant/provisioners/chef_solo_test.rb
View File

@ -38,7 +38,7 @@ class ChefSoloProvisionerTest < Test::Unit::TestCase
should "share each cookbook folder" do should "share each cookbook folder" do
share_seq = sequence("share_seq") share_seq = sequence("share_seq")
@host_cookbook_paths.each_with_index do |cookbook, i| @host_cookbook_paths.each_with_index do |cookbook, i|
@env.config.vm.expects(:share_folder).with("vagrant-chef-solo-#{i}", @action.cookbook_path(i), cookbook).in_sequence(share_seq) @env.config.vm.expects(:share_folder).with("vagrant-chef-solo-cookbooks-#{i}", @action.cookbook_path(i), cookbook).in_sequence(share_seq)
end end
@action.share_cookbook_folders @action.share_cookbook_folders
@ -54,7 +54,7 @@ class ChefSoloProvisionerTest < Test::Unit::TestCase
should "share each role folder" do should "share each role folder" do
share_seq = sequence("share_seq") share_seq = sequence("share_seq")
@host_role_paths.each_with_index do |role, i| @host_role_paths.each_with_index do |role, i|
@env.config.vm.expects(:share_folder).with("vagrant-chef-solo-#{i}", @action.role_path(i), role).in_sequence(share_seq) @env.config.vm.expects(:share_folder).with("vagrant-chef-solo-roles-#{i}", @action.role_path(i), role).in_sequence(share_seq)
end end
@action.share_role_folders @action.share_role_folders