From b93c6df9563fe7e7501f0acedaebfd80a5c4bb38 Mon Sep 17 00:00:00 2001
From: Timothy Messier <tim.messier@gmail.com>
Date: Sun, 27 Apr 2014 12:29:13 -0400
Subject: [PATCH] The various `install` args should always be passed to
 salt-bootstrap.

Even when preforming config only, the install flags (i.e. -M, -S, -N),
are used by the bootstrap to determine which configs to copy.

This should help with #3542 and should supersede #3548.
---
 plugins/provisioners/salt/provisioner.rb | 31 ++++++++++++------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/plugins/provisioners/salt/provisioner.rb b/plugins/provisioners/salt/provisioner.rb
index bbf8207f7..933801891 100644
--- a/plugins/provisioners/salt/provisioner.rb
+++ b/plugins/provisioners/salt/provisioner.rb
@@ -106,26 +106,25 @@ module VagrantPlugins
 
         if configure && !install
           options = "%s -C" % options
-        else
-          if @config.install_master
-            options = "%s -M" % options
-          end
 
-          if @config.install_syndic
-            options = "%s -S" % options
-          end
+        if @config.install_master
+          options = "%s -M" % options
+        end
 
-          if @config.no_minion
-            options = "%s -N" % options
-          end
+        if @config.install_syndic
+          options = "%s -S" % options
+        end
 
-          if @config.install_type
-            options = "%s %s" % [options, @config.install_type]
-          end
+        if @config.no_minion
+          options = "%s -N" % options
+        end
 
-          if @config.install_args
-            options = "%s %s" % [options, @config.install_args]
-          end
+        if @config.install_type
+          options = "%s %s" % [options, @config.install_type]
+        end
+
+        if @config.install_args
+          options = "%s %s" % [options, @config.install_args]
         end
 
         if @config.verbose