From 7cd7077467c926c6e604bc9402bc628f213a74b2 Mon Sep 17 00:00:00 2001
From: Nicolas Delaby <nicolas.delaby@ezeep.com>
Date: Fri, 29 Nov 2013 15:52:12 +0100
Subject: [PATCH] salt-bootstrap.sh: options are only allowed before install
 arguments

---
 plugins/provisioners/salt/provisioner.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/provisioners/salt/provisioner.rb b/plugins/provisioners/salt/provisioner.rb
index f1052caa9..8b4ba4c6e 100644
--- a/plugins/provisioners/salt/provisioner.rb
+++ b/plugins/provisioners/salt/provisioner.rb
@@ -79,11 +79,6 @@ module VagrantPlugins
       def bootstrap_options(install, configure, config_dir)
         options = ""
 
-        ## Any extra options passed to bootstrap
-        if @config.bootstrap_options
-          options = "%s %s" % [options, @config.bootstrap_options]
-        end
-
         if configure
           options = "%s -c %s" % [options, config_dir]
         end
@@ -126,6 +121,11 @@ module VagrantPlugins
           end
         end
 
+        ## Any extra options passed to bootstrap
+        if @config.bootstrap_options
+          options = "%s %s" % [options, @config.bootstrap_options]
+        end
+
         if @config.verbose
           @machine.env.ui.info "Using Bootstrap Options: %s" % options
         end