From 085b97b03fbaa757a6651aadee3d97efb09281ba Mon Sep 17 00:00:00 2001
From: David Lindquist <david.lindquist@hulu.com>
Date: Tue, 8 Jan 2013 18:51:54 -0800
Subject: [PATCH] Place minion keys and config before install

https://github.com/saltstack/salt-bootstrap/issues/14
---
 bootstrap-salt-minion.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/bootstrap-salt-minion.sh b/bootstrap-salt-minion.sh
index 62d05fa..93a4b3b 100755
--- a/bootstrap-salt-minion.sh
+++ b/bootstrap-salt-minion.sh
@@ -961,14 +961,6 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-# Install Salt
-echo " * Running ${INSTALL_FUNC}()"
-$INSTALL_FUNC
-if [ $? -ne 0 ]; then
-    echo " * Failed to run ${INSTALL_FUNC}()!!!"
-    exit 1
-fi
-
 # Configure Salt
 if [ "$TEMP_CONFIG_DIR" != "null" -a "$CONFIG_MINION_FUNC" != "null" ]; then
     echo " * Running ${CONFIG_MINION_FUNC}()"
@@ -979,6 +971,14 @@ if [ "$TEMP_CONFIG_DIR" != "null" -a "$CONFIG_MINION_FUNC" != "null" ]; then
     fi
 fi
 
+# Install Salt
+echo " * Running ${INSTALL_FUNC}()"
+$INSTALL_FUNC
+if [ $? -ne 0 ]; then
+    echo " * Failed to run ${INSTALL_FUNC}()!!!"
+    exit 1
+fi
+
 # Run any post install function
 if [ "$POST_INSTALL_FUNC" != "null" ]; then
     echo " * Running ${POST_INSTALL_FUNC}()"