From: abhijit_onap <abhijit.das.gupta@huawei.com>
Date: Fri, 7 Jun 2019 11:17:04 +0000 (+0000)
Subject: Modified scripts
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=cfe405b4861af53b77abe7b7cd3e5caa2e76484b;p=eliot.git

Modified scripts

Scripts modified to avoid displaying user and password
in the console

Signed-off-by: abhijit_onap <abhijit.das.gupta@huawei.com>
Change-Id: I4fcd4cd9a2d0e30bb26c94ebc60bf2e824c15285
---

diff --git a/scripts/generatePromeyml.sh b/scripts/generatePromeyml.sh
index b986788..2dcf999 100755
--- a/scripts/generatePromeyml.sh
+++ b/scripts/generatePromeyml.sh
@@ -26,7 +26,7 @@ do
   echo $workernodeip
   count=2
   echo $count
-done < nodelist
+done < nodelist > /dev/null 2>&1
 
 echo "workernodeip="
 echo $workernodeip
diff --git a/scripts/setup.sh b/scripts/setup.sh
index 9efe547..e1b04a4 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -69,7 +69,7 @@ setup_k8sworkers()
      sshpass -p ${nodepaswd} ssh ${nodeusr}@${nodeip} ${SETUP_WORKER_COMMON} < /dev/null
      sshpass -p ${nodepaswd} ssh ${nodeusr}@${nodeip} ${SETUP_WORKER} < /dev/null
      sshpass -p ${nodepaswd} ssh ${nodeusr}@${nodeip} ${KUBEADM_JOIN} < /dev/null
- done < nodelist
+ done < nodelist > /dev/null 2>&1
 
 }
 
@@ -83,7 +83,7 @@ verify_k8s_status(){
 
 install_cadvisor_edge(){
  set -o xtrace
- SETUP_CADVISOR_ATEDGE="cd AfterRelease1/eliot/scripts/ && source cadvisorsetup.sh" 
+ SETUP_CADVISOR_ATEDGE="cd eliot/scripts/ && source cadvisorsetup.sh" 
  while read line
  do
      nodeinfo="${line}"
@@ -91,7 +91,7 @@ install_cadvisor_edge(){
      nodeip=$(echo ${nodeinfo} | cut -d"|" -f2)
      nodepaswd=$(echo ${nodeinfo} | cut -d"|" -f3)
      sshpass -p ${nodepaswd} ssh ${nodeusr}@${nodeip} ${SETUP_CADVISOR_ATEDGE} < /dev/null
- done < nodelist
+ done < nodelist > /dev/null 2>&1
 }
 
 install_prometheus(){