Merge pull request #5435 from juiceinc/bugfix/salt-provisioner

Update Salt provisioner to allow more flexibility in passing arguments to the bootstrap script

plugins/provisioners/salt/provisioner.rb

@@ -143,6 +143,13 @@ module VagrantPlugins
           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

website/docs/source/v2/provisioning/salt.html.md

@@ -60,7 +60,13 @@ distribution's stable package manager, git tree-ish, daily ppa, or testing repos
 Not supported on Windows.
 
 * `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.
+
+* `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`