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

Merge pull request #6080 from driskell/patch-1 

Fix broken masterless minion configuration
This commit is contained in:
Seth Vargo 2015-08-12 10:53:14 -04:00
parent 186f3f25e3 ff941ef4e8
commit 2f782a95ba
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

@ -104,7 +104,7 @@ module VagrantPlugins
options = "%s %s" % [options, @config.bootstrap_options] options = "%s %s" % [options, @config.bootstrap_options]
end end
if configure && !@machine.config.vm.communicator == :winrm if configure && @machine.config.vm.communicator != :winrm
options = "%s -F -c %s" % [options, config_dir] options = "%s -F -c %s" % [options, config_dir]
end end