From 86e56aeac334c4d1d1ce9e20d1935a05af81549a Mon Sep 17 00:00:00 2001 From: Jurnell Cockhren Date: Thu, 8 Oct 2015 14:56:48 -0500 Subject: [PATCH] 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`