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

Merge pull request #6382 from sophicware/fix/salt-provisioner-install-args 

[salt] [bugfix] Restablize Salt provisioner
This commit is contained in:
Mitchell Hashimoto 2015-11-18 15:19:02 -08:00
parent 394f66468d 86e56aeac3
commit c43e0af4d7
3 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,6 @@ module VagrantPlugins
attr_accessor :install_args attr_accessor :install_args
attr_accessor :install_master attr_accessor :install_master
attr_accessor :install_syndic attr_accessor :install_syndic
attr_accessor :install_command
attr_accessor :no_minion attr_accessor :no_minion
attr_accessor :bootstrap_options attr_accessor :bootstrap_options
attr_accessor :version attr_accessor :version
@ -65,7 +64,6 @@ module VagrantPlugins
@install_args = UNSET_VALUE @install_args = UNSET_VALUE
@install_master = UNSET_VALUE @install_master = UNSET_VALUE
@install_syndic = UNSET_VALUE @install_syndic = UNSET_VALUE
@install_command = UNSET_VALUE
@no_minion = UNSET_VALUE @no_minion = UNSET_VALUE
@bootstrap_options = UNSET_VALUE @bootstrap_options = UNSET_VALUE
@masterless = UNSET_VALUE @masterless = UNSET_VALUE
@ -97,7 +95,6 @@ module VagrantPlugins
@install_args = nil if @install_args == UNSET_VALUE @install_args = nil if @install_args == UNSET_VALUE
@install_master = nil if @install_master == UNSET_VALUE @install_master = nil if @install_master == UNSET_VALUE
@install_syndic = nil if @install_syndic == UNSET_VALUE @install_syndic = nil if @install_syndic == UNSET_VALUE
@install_command = nil if @install_command == UNSET_VALUE
@no_minion = nil if @no_minion == UNSET_VALUE @no_minion = nil if @no_minion == UNSET_VALUE
@bootstrap_options = nil if @bootstrap_options == UNSET_VALUE @bootstrap_options = nil if @bootstrap_options == UNSET_VALUE
@masterless = false if @masterless == UNSET_VALUE @masterless = false if @masterless == UNSET_VALUE

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

@ -143,13 +143,6 @@ module VagrantPlugins
options = "%s %s" % [options, @config.install_args] options = "%s %s" % [options, @config.install_args]
end end
if @config.install_command
# If this is defined, we will ignore both install_type and
# install_args and use this instead. Every necessary command option
# will need to be specified by the user.
options = @config.install_command
end
if @config.verbose if @config.verbose
@machine.env.ui.info "Using Bootstrap Options: %s" % options @machine.env.ui.info "Using Bootstrap Options: %s" % options
end end

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

@ -57,16 +57,8 @@ on this machine. Not supported on Windows guest machines.
* `install_type` (stable | git | daily | testing) - 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. distribution's stable package manager, git tree-ish, daily ppa, or testing repository.
Not supported on Windows guest machines.
* `install_args` (develop) - When performing a git install, * `install_args` (develop) - When performing a git install, you can specify a branch, tag, or any treeish. Not supported on Windows.
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_command` (string) - Allow specifying an arbitrary string of arguments
to the bootstrap script. This will completely ignore `install_type` and `install_args`
to allow more flexibility with the bootstrap process.
* `always_install` (boolean) - Installs salt binaries even * `always_install` (boolean) - Installs salt binaries even
if they are already detected, default `false` if they are already detected, default `false`