Fixed salt version latest handling
Change-Id: I168bf8b7ae49077e0f2ac0de5fe0e0aab31da35e
diff --git a/bootstrap.sh b/bootstrap.sh
index 45de520..0b1cf68 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -81,6 +81,7 @@
# saltstack
BOOTSTRAP_SALTSTACK=${BOOTSTRAP_SALTSTACK:-True}
BOOTSTRAP_SALTSTACK_VERSION=${BOOTSTRAP_SALTSTACK_VERSION:- stable 2016.3 }
+BOOTSTRAP_SALTSTACK_VERSION=${BOOTSTRAP_SALTSTACK_VERSION//latest*/stable}
BOOTSTRAP_SALTSTACK_OPTS=${BOOTSTRAP_SALTSTACK_OPTS:- -dX $BOOTSTRAP_SALTSTACK_VERSION }
SALT_SOURCE=${SALT_SOURCE:-pkg}
# the version below is used salt pillar data
@@ -418,7 +419,7 @@
curl -L https://bootstrap.saltstack.com | $SUDO sh -s -- -M ${BOOTSTRAP_SALTSTACK_OPTS} &>/dev/null || true
;;
esac
-
+
which reclass-salt || {
test -e /usr/share/reclass/reclass-salt && {
ln -fs /usr/share/reclass/reclass-salt /usr/bin
@@ -447,7 +448,7 @@
echo -e "\nInstalling salt master ...\n"
# TODO: replace with saltstack bootstrap script
-
+
if [ "$SALT_VERSION" == "latest" ]; then
pip install salt
else