commit 679f15b731aa5635e434ff851a5799f8137f8cd5
author Petr Michalec <epcim@apealive.net> Mon Sep 18 16:16:29 2017 +0200
committer Petr Michalec <epcim@apealive.net> Mon Sep 18 16:16:29 2017 +0200
tree 2711ef430f67bcae88c95d9d6d49b96de14fe30a
parent 0fdbf9375e6b1885fcccfc0a9f89596da75645d7

improve checks

Change-Id: I66111d9b5c6c01eb8bc4a46ee982ece8afc43e46

bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 88efdd0..1238137 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -193,7 +193,7 @@
         git clone -b ${RECLASS_BRANCH:-master} ${RECLASS_ADDRESS} ${RECLASS_ROOT};		
     fi;
   fi;
-  if [ ! -d ${RECLASS_ROOT}/classes -o ! -d ${RECLASS_ROOT}/nodes ]; then
+  if [ ! -d ${RECLASS_ROOT}/classes ]; then
     log_err "Reclass ${RECLASS_ROOT} is not fetched locally;"
     ls -Rla ${RECLASS_ROOT}
     exit 1
@@ -719,7 +719,7 @@
 
 function verify_salt_minions() {
     #set -e
-    NODES=$(find $RECLASS_ROOT/nodes/ -name "*.yml" | grep -v "cfg")
+    NODES=$(find $RECLASS_ROOT/nodes/_generated/ -name "*.yml" | grep -v "cfg")
     log_info "Verifying minions: $(echo ${NODES}|xargs)"
 
     # Parallel