Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[salt] [bugfix] Restablize Salt provisioner #6382

Merged
merged 4 commits into from
Nov 18, 2015
Merged

[salt] [bugfix] Restablize Salt provisioner #6382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70e9079
Revert "Fix alignment of initializer"
Oct 8, 2015
fb611c7
Revert "Initialize the install_command salt config var"
Oct 8, 2015
1a7c6dc
Revert "Salt Provisioner: refactor custom install_type option to add …
Oct 8, 2015
86e56ae
Revert "Salt Provisioner: Added a 'custom' option to install_type to …
Oct 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions plugins/provisioners/salt/config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ class Config < Vagrant.plugin("2", :config)
attr_accessor :install_args
attr_accessor :install_master
attr_accessor :install_syndic
attr_accessor :install_command
attr_accessor :no_minion
attr_accessor :bootstrap_options
attr_accessor :version
Expand Down Expand Up @@ -62,7 +61,6 @@ def initialize
@install_args = UNSET_VALUE
@install_master = UNSET_VALUE
@install_syndic = UNSET_VALUE
@install_command = UNSET_VALUE
@no_minion = UNSET_VALUE
@bootstrap_options = UNSET_VALUE
@config_dir = UNSET_VALUE
Expand Down Expand Up @@ -95,7 +93,6 @@ def finalize!
@install_args = nil if @install_args == UNSET_VALUE
@install_master = nil if @install_master == 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
@bootstrap_options = nil if @bootstrap_options == UNSET_VALUE
@config_dir = nil if @config_dir == UNSET_VALUE
Expand Down
7 changes: 0 additions & 7 deletions plugins/provisioners/salt/provisioner.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,6 @@ def bootstrap_options(install, configure, config_dir)
options = "%s %s" % [options, @config.install_args]
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
@machine.env.ui.info "Using Bootstrap Options: %s" % options
end
Expand Down
10 changes: 1 addition & 9 deletions website/docs/source/v2/provisioning/salt.html.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,8 @@ on this machine. Not supported on Windows guest machines.

* `install_type` (stable | git | daily | testing) - Whether to install from a
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,
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.
* `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`
Expand Down