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

(#9802) Allow non-windows hosts to pass along version 

The salt bootstrap can now accept version arguments on non-windows
hosts, so this commit allows the Vagrant provisinoer to specify a
version.
This commit is contained in:
Brian Cain 2018-09-07 13:38:58 -07:00
parent 770b6e0cca
commit 13b09bedac
No known key found for this signature in database
GPG Key ID: 43D51080D357A001
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -304,6 +304,9 @@ module VagrantPlugins
end end
bootstrap_destination = File.join(config_dir, "bootstrap_salt.ps1") bootstrap_destination = File.join(config_dir, "bootstrap_salt.ps1")
else else
if @config.version
options += " %s" % @config.version
end
bootstrap_destination = File.join(config_dir, "bootstrap_salt.sh") bootstrap_destination = File.join(config_dir, "bootstrap_salt.sh")
end end

2
website/source/docs/provisioning/salt.html.md
View File

@ -75,7 +75,7 @@ distribution's stable package manager, git tree-ish, daily ppa, or testing repos
* `bootstrap_options` (string) - Additional command-line options to * `bootstrap_options` (string) - Additional command-line options to
pass to the bootstrap script. pass to the bootstrap script.
* `version` (string, default: "2017.7.1") - Version of minion to be installed. Only supported on Windows guest machines. * `version` (string, default: "2017.7.1") - Version of minion to be installed.
* `python_version` (string, default: "2") - Major Python version of minion to be installed. Only valid for minion versions >= 2017.7.0. Only supported on Windows guest machines. * `python_version` (string, default: "2") - Major Python version of minion to be installed. Only valid for minion versions >= 2017.7.0. Only supported on Windows guest machines.