20610: Removes the need to directly edit the arvados.sls pillar.

[arvados.git] / tools / salt-install / installer.sh

diff --git a/tools/salt-install/installer.sh b/tools/salt-install/installer.sh
index c86e9b02c3c7f169283c7db80d1202ddb5fa07be..cfa7b1454ad24cfad790ed542808a6635d5c0111 100755 (executable)
--- a/tools/salt-install/installer.sh
+++ b/tools/salt-install/installer.sh
@@ -47,6 +47,11 @@ declare GITTARGET
 # This will be populated by loadconfig()
 declare USE_SSH_JUMPHOST
 
 # This will be populated by loadconfig()
 declare USE_SSH_JUMPHOST
 

+# The temp file that will get used to disable envvar forwarding to avoid locale
+# issues in Debian distros.
+# This will be populated by loadconfig()
+declare SSH_CONFFILE
+

 checktools() {
     local MISSING=''
     for a in git ip ; do
 checktools() {
     local MISSING=''
     for a in git ip ; do


@@ -127,19 +132,26 @@ deploynode() {
 }
 
 loadconfig() {
 }
 
 loadconfig() {

-    if [[ ! -s $CONFIG_FILE ]] ; then
+    if ! [[ -s ${CONFIG_FILE} && -s ${CONFIG_FILE}.secrets ]]; then

                echo "Must be run from initialized setup dir, maybe you need to 'initialize' first?"
     fi
                echo "Must be run from initialized setup dir, maybe you need to 'initialize' first?"
     fi

+    source ${CONFIG_FILE}.secrets

     source ${CONFIG_FILE}
     GITTARGET=arvados-deploy-config-${CLUSTER}
     source ${CONFIG_FILE}
     GITTARGET=arvados-deploy-config-${CLUSTER}

+
+       # Set up SSH so that it doesn't forward any environment variable. This is to avoid
+       # getting "setlocale" errors on the first run, depending on the distro being used
+       # to run the installer (like Debian).
+       SSH_CONFFILE=$(mktemp)
+       echo "Include config SendEnv -*" > ${SSH_CONFFILE}

 }
 
 ssh_cmd() {
        local NODE=$1
        if [ -z "${USE_SSH_JUMPHOST}" -o "${NODE}" == "${USE_SSH_JUMPHOST}" -o "${NODE}" == "localhost" ]; then
 }
 
 ssh_cmd() {
        local NODE=$1
        if [ -z "${USE_SSH_JUMPHOST}" -o "${NODE}" == "${USE_SSH_JUMPHOST}" -o "${NODE}" == "localhost" ]; then

-               echo "ssh"
+               echo "ssh -F ${SSH_CONFFILE}"

        else
        else

-               echo "ssh -J ${DEPLOY_USER}@${USE_SSH_JUMPHOST}"
+               echo "ssh -F ${SSH_CONFFILE} -J ${DEPLOY_USER}@${USE_SSH_JUMPHOST}"

        fi
 }
 
        fi
 }
 


@@ -198,6 +210,7 @@ case "$subcmd" in
        cp -r *.sh tests $SETUPDIR
 
        cp local.params.example.$PARAMS $SETUPDIR/${CONFIG_FILE}
        cp -r *.sh tests $SETUPDIR
 
        cp local.params.example.$PARAMS $SETUPDIR/${CONFIG_FILE}

+       cp local.params.secrets.example $SETUPDIR/${CONFIG_FILE}.secrets

        cp -r config_examples/$SLS $SETUPDIR/${CONFIG_DIR}
 
        if [[ -n "$TERRAFORM" ]] ; then
        cp -r config_examples/$SLS $SETUPDIR/${CONFIG_DIR}
 
        if [[ -n "$TERRAFORM" ]] ; then


@@ -214,7 +227,7 @@ case "$subcmd" in
                git add terraform
        fi
 
                git add terraform
        fi
 

-       git add *.sh ${CONFIG_FILE} ${CONFIG_DIR} tests .gitignore
+       git add *.sh ${CONFIG_FILE} ${CONFIG_FILE}.secrets ${CONFIG_DIR} tests .gitignore

        git commit -m"initial commit"
 
        echo
        git commit -m"initial commit"
 
        echo


@@ -225,7 +238,7 @@ case "$subcmd" in
            (cd $SETUPDIR/terraform/services && terraform init)
            echo "Now go to $SETUPDIR, customize 'terraform/vpc/terraform.tfvars' as needed, then run 'installer.sh terraform'"
        else
            (cd $SETUPDIR/terraform/services && terraform init)
            echo "Now go to $SETUPDIR, customize 'terraform/vpc/terraform.tfvars' as needed, then run 'installer.sh terraform'"
        else

-           echo "Now go to $SETUPDIR, customize '${CONFIG_FILE}' and '${CONFIG_DIR}' as needed, then run 'installer.sh deploy'"
+               echo "Now go to $SETUPDIR, customize '${CONFIG_FILE}', '${CONFIG_FILE}.secrets' and '${CONFIG_DIR}' as needed, then run 'installer.sh deploy'"

        fi
        ;;
 
        fi
        ;;
 


@@ -259,7 +272,7 @@ case "$subcmd" in
 
        loadconfig
 
 
        loadconfig
 

-       if grep -rni 'fixme' ${CONFIG_FILE} ${CONFIG_DIR} ; then
+       if grep -rni 'fixme' ${CONFIG_FILE} ${CONFIG_FILE}.secrets ${CONFIG_DIR} ; then

            echo
            echo "Some parameters still need to be updated.  Please fix them and then re-run deploy."
            exit 1
            echo
            echo "Some parameters still need to be updated.  Please fix them and then re-run deploy."
            exit 1


@@ -270,7 +283,7 @@ case "$subcmd" in
        set -x
 
        git add -A
        set -x
 
        git add -A

-       if ! git diff --cached --exit-code ; then
+       if ! git diff --cached --exit-code --quiet ; then

            git commit -m"prepare for deploy"
        fi
 
            git commit -m"prepare for deploy"
        fi
 


@@ -294,13 +307,22 @@ case "$subcmd" in
 
            for NODE in "${!NODES[@]}"
            do
 
            for NODE in "${!NODES[@]}"
            do

-               # then  'api' or 'controller' roles
+               # then 'api' or 'controller' roles

                if [[ "${NODES[$NODE]}" =~ (api|controller) ]] ; then
                    deploynode $NODE "${NODES[$NODE]}"
                    unset NODES[$NODE]
                fi
            done
 
                if [[ "${NODES[$NODE]}" =~ (api|controller) ]] ; then
                    deploynode $NODE "${NODES[$NODE]}"
                    unset NODES[$NODE]
                fi
            done
 

+           for NODE in "${!NODES[@]}"
+           do
+               # then 'balancer' role
+               if [[ "${NODES[$NODE]}" =~ (balancer) ]] ; then
+                   deploynode $NODE "${NODES[$NODE]}"
+                   unset NODES[$NODE]
+               fi
+           done
+

            for NODE in "${!NODES[@]}"
            do
                # Everything else (we removed the nodes that we
            for NODE in "${!NODES[@]}"
            do
                # Everything else (we removed the nodes that we