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

Merge pull request #2290 from ianheggie/fix_provision_permissions_error_on_bootstrap 

provisioners/salt: remove bootstrap definition on each run
This commit is contained in:
Mitchell Hashimoto 2013-10-01 11:27:26 -07:00
parent c8534dc407 4f11716633
commit efdffcdf2b
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/provisioners/salt/provisioner.rb
View File

@ -193,6 +193,7 @@ module VagrantPlugins
bootstrap_path = get_bootstrap bootstrap_path = get_bootstrap
bootstrap_destination = File.join(config_dir, "bootstrap_salt.sh") bootstrap_destination = File.join(config_dir, "bootstrap_salt.sh")
@machine.communicate.sudo("rm -f %s" % bootstrap_destination)
@machine.communicate.upload(bootstrap_path.to_s, bootstrap_destination) @machine.communicate.upload(bootstrap_path.to_s, bootstrap_destination)
@machine.communicate.sudo("chmod +x %s" % bootstrap_destination) @machine.communicate.sudo("chmod +x %s" % bootstrap_destination)
bootstrap = @machine.communicate.sudo("%s %s" % [bootstrap_destination, options]) do |type, data| bootstrap = @machine.communicate.sudo("%s %s" % [bootstrap_destination, options]) do |type, data|