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

Merge pull request #2359 from viq/patch-1 

provisioners/salt: fix seed_master key file name
This commit is contained in:
Mitchell Hashimoto 2013-10-14 20:06:51 -07:00
parent 569b223b83 fee0f8d8ab
commit cfd81da97e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,7 +93,7 @@ module VagrantPlugins
@machine.communicate.sudo("mkdir -p -m777 #{seed_dir}") @machine.communicate.sudo("mkdir -p -m777 #{seed_dir}")
@config.seed_master.each do |name, keyfile| @config.seed_master.each do |name, keyfile|
sourcepath = expanded_path(keyfile).to_s sourcepath = expanded_path(keyfile).to_s
dest = "#{seed_dir}/seed-#{name}.pub" dest = "#{seed_dir}/#{name}"
@machine.communicate.upload(sourcepath, dest) @machine.communicate.upload(sourcepath, dest)
end end
options = "#{options} -k #{seed_dir}" options = "#{options} -k #{seed_dir}"