Merge pull request #124 from n-rodriguez/fix/salt_version_check

Fix Salt version comparison on Salt install
saltstack · Aug 2, 2017 · 74afa16 · 74afa16
2 parents b361a72 + 56e656a
commit 74afa16
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/lib/kitchen/provisioner/install.erb b/lib/kitchen/provisioner/install.erb
@@ -55,6 +55,14 @@ fi
 # check again, now that an install of some form should have happened
 command -v salt-call >/dev/null 2>&1 && SALT_VERSION=$(salt-call --version|cut -d " " -f 2)
 
+# extract short format of Salt version
+if [ ! -z "${SALT_VERSION}" ]
+then
+  YEAR=$(echo "$SALT_VERSION" | cut -d "." -f1)
+  MONTH=$(echo "$SALT_VERSION" | cut -d "." -f2)
+  SALT_VERSION="${YEAR}.${MONTH}"
+fi
+
 if [ -z "${SALT_VERSION}" ]
 then
   echo "No salt-minion installed, install must have failed!!"