18870: Check for 'fixme's

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/tools/salt-install/installer.sh b/tools/salt-install/installer.sh
index 17890d646efb272b760d0beb0cbd4aef92dcb4cd..79c85c89c1c5c5f966f863a6e7b5769eb42b37d2 100755 (executable)
--- a/tools/salt-install/installer.sh
+++ b/tools/salt-install/installer.sh
@@ -40,6 +40,7 @@ deploynode() {
 
 loadconfig() {
     CONFIG_FILE=local.params
 
 loadconfig() {
     CONFIG_FILE=local.params

+    CONFIG_DIR=local_config_dir

     if [[ ! -s $CONFIG_FILE ]] ; then
        echo "Must be run from initialized setup dir, maybe you need to 'initialize' first?"
     fi
     if [[ ! -s $CONFIG_FILE ]] ; then
        echo "Must be run from initialized setup dir, maybe you need to 'initialize' first?"
     fi


@@ -102,10 +103,16 @@ case "$subcmd" in
 
        loadconfig
 
 
        loadconfig
 

-       set -x
+       if grep -rni 'fixme' ${CONFIG_FILE} ${CONFIG_DIR} ; then
+           echo
+           echo "Some parameters still need to be updated.  Please fix them and then re-run deploy."
+           exit 1
+       fi

 
        BRANCH=$(git branch --show-current)
 
 
        BRANCH=$(git branch --show-current)
 

+       set -x
+

        git add -A
        if ! git diff --cached --exit-code ; then
            git commit -m"prepare for deploy"
        git add -A
        if ! git diff --cached --exit-code ; then
            git commit -m"prepare for deploy"

diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index da3ef88a823c6bc61c646dc5ab21d328eb950ffe..f4660be370990302cadbb9b3e11d8f2a44f5de10 100755 (executable)
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -257,7 +257,7 @@ if [ ! -d ${CONFIG_DIR} ]; then
   exit 1
 fi
 
   exit 1
 fi
 

-if grep -q 'fixme_or_this_wont_work' ${CONFIG_FILE} ; then
+if grep -rni 'fixme' ${CONFIG_FILE} ${CONFIG_DIR} ; then

   echo >&2 "The config file ${CONFIG_FILE} has some parameters that need to be modified."
   echo >&2 "Please, fix them and re-run the provision script."
   exit 1
   echo >&2 "The config file ${CONFIG_FILE} has some parameters that need to be modified."
   echo >&2 "Please, fix them and re-run the provision script."
   exit 1