From 70e9079449333fbb11dd0a5cb7026d1986cc505b Mon Sep 17 00:00:00 2001 From: Jurnell Cockhren Date: Thu, 8 Oct 2015 14:00:38 -0500 Subject: [PATCH 1/4] Revert "Fix alignment of initializer" Refers to issues #6276, #5973 and #5936 This reverts commit 27d751863673435693b775bf44e79b9f688a8968. --- plugins/provisioners/salt/config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/provisioners/salt/config.rb b/plugins/provisioners/salt/config.rb index 9c564179e..084dc457c 100644 --- a/plugins/provisioners/salt/config.rb +++ b/plugins/provisioners/salt/config.rb @@ -95,7 +95,7 @@ module VagrantPlugins @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 + @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 From fb611c7389ea068a9aed010fd7693ff7d9c87b25 Mon Sep 17 00:00:00 2001 From: Jurnell Cockhren Date: Thu, 8 Oct 2015 14:04:44 -0500 Subject: [PATCH 2/4] Revert "Initialize the install_command salt config var" Refers to issues #6276, #5973 and #5936 This reverts commit ccd735466524e5cdea353714e06d9a3c88d17bdc. --- plugins/provisioners/salt/config.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/plugins/provisioners/salt/config.rb b/plugins/provisioners/salt/config.rb index 084dc457c..4d9550406 100644 --- a/plugins/provisioners/salt/config.rb +++ b/plugins/provisioners/salt/config.rb @@ -33,7 +33,6 @@ module VagrantPlugins 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 @@ -62,7 +61,6 @@ module VagrantPlugins @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 @@ -95,7 +93,6 @@ module VagrantPlugins @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 From 1a7c6dcfeb7db6e726c4918a0c271c7cfe8a99cb Mon Sep 17 00:00:00 2001 From: Jurnell Cockhren Date: Thu, 8 Oct 2015 14:51:40 -0500 Subject: [PATCH 3/4] Revert "Salt Provisioner: refactor custom install_type option to add install_command instead" Refers to issues #6276, #5973, #5936 and #5435 This reverts commit 72e63767ac5807277dfe7f2202d3ab25804fe0df. Conflicts: website/docs/source/v2/provisioning/salt.html.md --- plugins/provisioners/salt/provisioner.rb | 13 +++++-------- website/docs/source/v2/provisioning/salt.html.md | 7 +------ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/plugins/provisioners/salt/provisioner.rb b/plugins/provisioners/salt/provisioner.rb index 72365776e..fb021d418 100644 --- a/plugins/provisioners/salt/provisioner.rb +++ b/plugins/provisioners/salt/provisioner.rb @@ -136,20 +136,17 @@ module VagrantPlugins end if @config.install_type - options = "%s %s" % [options, @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 end if @config.install_args 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 diff --git a/website/docs/source/v2/provisioning/salt.html.md b/website/docs/source/v2/provisioning/salt.html.md index 938fec155..aab48b7bd 100644 --- a/website/docs/source/v2/provisioning/salt.html.md +++ b/website/docs/source/v2/provisioning/salt.html.md @@ -54,19 +54,14 @@ 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) - Whether to install from a +* `install_type` (stable | git | daily | testing | custom) - 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. - * `always_install` (boolean) - Installs salt binaries even if they are already detected, default `false` From 86e56aeac334c4d1d1ce9e20d1935a05af81549a Mon Sep 17 00:00:00 2001 From: Jurnell Cockhren Date: Thu, 8 Oct 2015 14:56:48 -0500 Subject: [PATCH 4/4] 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 0289ab986c053f7d3bc825142c82a07bcf0ae3ec. Refers to issues #6276, #5973, #5936 and #5435 Conflicts: website/docs/source/v2/provisioning/salt.html.md --- plugins/provisioners/salt/provisioner.rb | 6 +----- website/docs/source/v2/provisioning/salt.html.md | 7 ++----- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/plugins/provisioners/salt/provisioner.rb b/plugins/provisioners/salt/provisioner.rb index fb021d418..f7b4406e9 100644 --- a/plugins/provisioners/salt/provisioner.rb +++ b/plugins/provisioners/salt/provisioner.rb @@ -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 diff --git a/website/docs/source/v2/provisioning/salt.html.md b/website/docs/source/v2/provisioning/salt.html.md index aab48b7bd..d4d13bf61 100644 --- a/website/docs/source/v2/provisioning/salt.html.md +++ b/website/docs/source/v2/provisioning/salt.html.md @@ -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`