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

Merge pull request #9431 from blueyed/options-without-leading-space 

salt: remove leading space with bootstrap_options
This commit is contained in:
Brian Cain 2018-09-17 11:26:54 -07:00 committed by GitHub
parent ff3d1235fb 496d9b24c1
commit 9ad04ada6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,11 +110,11 @@ module VagrantPlugins
# Generates option string for bootstrap script # Generates option string for bootstrap script
def bootstrap_options(install, configure, config_dir) def bootstrap_options(install, configure, config_dir)
options = ""
# Any extra options passed to bootstrap # Any extra options passed to bootstrap
if @config.bootstrap_options if @config.bootstrap_options
options = "%s %s" % [options, @config.bootstrap_options] options = @config.bootstrap_options
else
options = ""
end end
if @config.master_json_config && @machine.config.vm.communicator != :winrm if @config.master_json_config && @machine.config.vm.communicator != :winrm