hpcc-14132 Fix ssh calls from scripts to include LogLevel=QUIET

Signed-off-by: Michael Gardner <Michael.Gardner@lexisnexis.com>

initfiles/bin/init_thorslave

@@ -85,8 +85,8 @@ start_slaves()
     ln -s -f $deploydir/thorslave_lcr ${slavename}
 
     # sync to current master thorgroup
-    log "rsync -e ssh -o StrictHostKeyChecking=no ${master}:${instancedir}/thorgroup ${instancedir}/thorgroup.slave"
-    rsync -e "ssh -o StrictHostKeyChecking=no" $master:$instancedir/thorgroup $instancedir/thorgroup.slave
+    log "rsync -e ssh -o LogLevel=QUIET -o StrictHostKeyChecking=no ${master}:${instancedir}/thorgroup ${instancedir}/thorgroup.slave"
+    rsync -e "ssh -o LogLevel=QUIET -o StrictHostKeyChecking=no" $master:$instancedir/thorgroup $instancedir/thorgroup.slave
 
     let "slavenum = 1";
     for slave in $(cat $instancedir/thorgroup.slave); do

initfiles/componentfiles/thor/sshslaves

@@ -22,7 +22,7 @@ COUNTER=1
 for slave in $(cat slaves); do
     echo sshing slave $COUNTER - $slave:
     echo ssh $THORUSER@$slave $1
-    ssh $THORUSER@$slave $1
+    ssh -o LogLevel=QUIET $THORUSER@$slave $1
     let COUNTER=COUNTER+1
 done
 

initfiles/sbin/deploy-java-files.exp

@@ -65,9 +65,9 @@ proc checkConnectionAndTarget {} {
    puts "Test connection and make sure target directory exists."
    if { [ string length $::env(password)] == 0 } {
       spawn ssh -i ${user_home}/.ssh/id_rsa -o BatchMode=yes \
-          -o StrictHostKeyChecking=no ${user}@${ip}
+          -o LogLevel=QUIET -o StrictHostKeyChecking=no ${user}@${ip}
    } else {
-      spawn ssh ${user}@${ip}
+      spawn ssh -o LogLevel=QUIET ${user}@${ip}
    }
 
    expect {
@@ -173,9 +173,9 @@ proc moveFiles {} {
    puts "Move files from temporay directory to target through sudo"
    if { [string length ${password}] == 0 } {
       spawn ssh -i ${user_home}/.ssh/id_rsa -o BatchMode=yes \
-         -o StrictHostKeyChecking=no ${user}@${ip}
+         -o LogLevel=QUIET -o StrictHostKeyChecking=no ${user}@${ip}
    } else {
-      spawn ssh ${user}@${ip}
+      spawn ssh -o LogLevel=QUIET ${user}@${ip}
    }
 
    expect {

initfiles/sbin/deploy-java-files.sh.in

@@ -225,13 +225,13 @@ createScriptFileUpdateClasspath() {
    composeClasspath
    cat >> $SCRIPT_FILE <<SCRIPTPATH
 
-CAN_SSH="\$(ssh -i $home/$user/.ssh/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no $user@\$IP exit > /dev/null 2>&1; echo \$?)"
+CAN_SSH="\$(ssh -i $home/$user/.ssh/id_rsa -o BatchMode=yes -o LogLevel=QUIET -o StrictHostKeyChecking=no $user@\$IP exit > /dev/null 2>&1; echo \$?)"
 if [ "\$CAN_SSH" -eq 255 ]; then
    echo "\$IP: Cannot SSH to host as user $user.";
    exit 1
 fi
 
-ssh -i $home/$user/.ssh/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no $user@\$IP  << 'SSHCMD'
+ssh -i $home/$user/.ssh/id_rsa -o BatchMode=yes -o LogLevel=QUIET -o StrictHostKeyChecking=no $user@\$IP  << 'SSHCMD'
 
 NEW_JAVA_CLASSPATH=
 SCRIPTPATH

initfiles/sbin/hpcc-push.sh.in

@@ -48,7 +48,7 @@ IP=\$1
 
 if ping -c 1 -w 5 -n \$IP > /dev/null 2>&1; then
     echo "\$IP: Host is alive."
-    CAN_SSH="\`ssh -i $home/$user/.ssh/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no $user@\$IP exit > /dev/null 2>&1; echo \$?\`"
+    CAN_SSH="\`ssh -i $home/$user/.ssh/id_rsa -o BatchMode=yes -o LogLevel=QUIET -o StrictHostKeyChecking=no $user@\$IP exit > /dev/null 2>&1; echo \$?\`"
     if [ "\$CAN_SSH" -eq 255 ]; then
        echo "\$IP: Cannot SSH to host.";
     else

initfiles/sbin/install-hpcc.exp

@@ -37,14 +37,14 @@ proc print_usage {} {
 proc sshcmd { cmd params_string } {
   global password user
   if {[string length $password] == 0 } {
-     set cmd2 "$cmd -o BatchMode=yes -o StrictHostKeyChecking=no"
+     set cmd2 "$cmd -o LogLevel=QUIET -o BatchMode=yes -o StrictHostKeyChecking=no"
      if {[string compare $::env(USER) $user] == 0} {
         return "$cmd2 $params_string"
      } else {
         return "su $user -c \"$cmd2  [regsub -all "\"" $params_string \\\"]\""
      }
   } else {
-     return "$cmd $params_string"
+     return "$cmd -o LogLevel=QUIET $params_string"
   }
 }