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

Revert "Salt Provisioner: Added a 'custom' option to install_type to allow more flexibility in passing arguments to the bootstrap script. Updated the docs." 

This reverts commit 0289ab986c.

Refers to issues #6276, #5973, #5936 and #5435

Conflicts:
	website/docs/source/v2/provisioning/salt.html.md
This commit is contained in:
Jurnell Cockhren 2015-10-08 14:56:48 -05:00
parent 1a7c6dcfeb
commit 86e56aeac3
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,11 +136,7 @@ module VagrantPlugins
end
if @config.install_type
# Allow passing install_args as an arbitrary string rather
# than trying to format it based on known options
if @config.install_type != "custom"
options = "%s %s" % [options, @config.install_type]
end
options = "%s %s" % [options, @config.install_type]
end
if @config.install_args

7
website/docs/source/v2/provisioning/salt.html.md
View File

@ -54,13 +54,10 @@ on this machine. Not supported on Windows guest machines.
* `install_syndic` (boolean) - Install the salt-syndic, default
`false`. Not supported on Windows guest machines.
* `install_type` (stable | git | daily | testing | custom) - Whether to install from a
* `install_type` (stable | git | daily | testing) - Whether to install from a
distribution's stable package manager, git tree-ish, daily ppa, or testing repository.
* `install_args` (develop) - When performing a git install,
you can specify a branch, tag, or any treeish. If using the `custom` install type,
you can also specify a different repository to install from.
Not supported on Windows guest machines.
* `install_args` (develop) - When performing a git install, you can specify a branch, tag, or any treeish. Not supported on Windows.
* `always_install` (boolean) - Installs salt binaries even
if they are already detected, default `false`