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

Merge pull request #2242 from bt5e/move-up-chmod-in-puppet 

provisioners/puppet-apply: moved chmod up before verify_shared_folders check #2241
This commit is contained in:
Mitchell Hashimoto 2013-09-20 21:12:10 -07:00
parent 79fa7000fa cd79563837
commit 7df64dff0c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/provisioners/puppet/provisioner/puppet.rb
View File

@ -48,17 +48,17 @@ module VagrantPlugins
check << guest_path check << guest_path
end end
verify_shared_folders(check)
# Verify Puppet is installed and run it
verify_binary("puppet")
# Make sure the temporary directory is properly set up # Make sure the temporary directory is properly set up
@machine.communicate.tap do |comm| @machine.communicate.tap do |comm|
comm.sudo("mkdir -p #{config.temp_dir}") comm.sudo("mkdir -p #{config.temp_dir}")
comm.sudo("chmod 0777 #{config.temp_dir}") comm.sudo("chmod 0777 #{config.temp_dir}")
end end
verify_shared_folders(check)
# Verify Puppet is installed and run it
verify_binary("puppet")
# Upload Hiera configuration if we have it # Upload Hiera configuration if we have it
@hiera_config_path = nil @hiera_config_path = nil
if config.hiera_config_path if config.hiera_config_path