Revert "Allocate pseudo tty for ssh"
Reason: extra error messages when running "onos-test" Pseudo-terminal will not be allocated because stdin is not a terminal. This reverts commit 6ac0d554. Change-Id: I509b9e9dc941e1e7d281457693b1b74a5eb621e3
Showing
4 changed files
with
4 additions
and
5 deletions
... | @@ -18,7 +18,7 @@ echo " { \"id\": \"$OC1\", \"ip\": \"$OC1\", \"tcpPort\": 9876 }" >> $CDEF_FILE | ... | @@ -18,7 +18,7 @@ echo " { \"id\": \"$OC1\", \"ip\": \"$OC1\", \"tcpPort\": 9876 }" >> $CDEF_FILE |
18 | echo "]}" >> $CDEF_FILE | 18 | echo "]}" >> $CDEF_FILE |
19 | scp -q $CDEF_FILE $remote:$ONOS_INSTALL_DIR/config/cluster.json | 19 | scp -q $CDEF_FILE $remote:$ONOS_INSTALL_DIR/config/cluster.json |
20 | 20 | ||
21 | -ssh -t $remote " | 21 | +ssh $remote " |
22 | sudo perl -pi.bak -e \"s/ <interface>.*</ <interface>${ONOS_NIC:-192.168.56.*}</g\" \ | 22 | sudo perl -pi.bak -e \"s/ <interface>.*</ <interface>${ONOS_NIC:-192.168.56.*}</g\" \ |
23 | $ONOS_INSTALL_DIR/$KARAF_DIST/etc/hazelcast.xml | 23 | $ONOS_INSTALL_DIR/$KARAF_DIST/etc/hazelcast.xml |
24 | sudo perl -pi -e \"s/ <name>onos</ <name>${ONOS_CELL:-onos}</g\" \ | 24 | sudo perl -pi -e \"s/ <name>onos</ <name>${ONOS_CELL:-onos}</g\" \ | ... | ... |
... | @@ -23,7 +23,7 @@ remote=$ONOS_USER@$node | ... | @@ -23,7 +23,7 @@ remote=$ONOS_USER@$node |
23 | 23 | ||
24 | scp -q $ONOS_TAR $remote:/tmp | 24 | scp -q $ONOS_TAR $remote:/tmp |
25 | 25 | ||
26 | -ssh -t $remote " | 26 | +ssh $remote " |
27 | [ -d $ONOS_INSTALL_DIR/bin ] && echo \"ONOS is already installed\" && exit 1 | 27 | [ -d $ONOS_INSTALL_DIR/bin ] && echo \"ONOS is already installed\" && exit 1 |
28 | 28 | ||
29 | # Prepare a landing zone and unroll the bits | 29 | # Prepare a landing zone and unroll the bits |
... | @@ -45,7 +45,6 @@ ssh -t $remote " | ... | @@ -45,7 +45,6 @@ ssh -t $remote " |
45 | 45 | ||
46 | # Remove any previous ON.Lab bits from ~/.m2 repo and re-stage it. | 46 | # Remove any previous ON.Lab bits from ~/.m2 repo and re-stage it. |
47 | rm -fr ~/.m2/repository/org/onlab | 47 | rm -fr ~/.m2/repository/org/onlab |
48 | - mkdir -p ~/.m2/repository/org/onlab | ||
49 | cp -r $ONOS_INSTALL_DIR/$KARAF_DIST/system/org/onlab ~/.m2/repository/org/onlab | 48 | cp -r $ONOS_INSTALL_DIR/$KARAF_DIST/system/org/onlab ~/.m2/repository/org/onlab |
50 | 49 | ||
51 | # Drop log level for the console | 50 | # Drop log level for the console | ... | ... |
... | @@ -40,5 +40,5 @@ fi | ... | @@ -40,5 +40,5 @@ fi |
40 | 40 | ||
41 | # Execute the remote commands | 41 | # Execute the remote commands |
42 | for node in $nodes; do | 42 | for node in $nodes; do |
43 | - ssh -t $ONOS_USER@${node} "sudo service onos ${2:-status}" | 43 | + ssh $ONOS_USER@${node} "sudo service onos ${2:-status}" |
44 | done | 44 | done | ... | ... |
... | @@ -8,7 +8,7 @@ | ... | @@ -8,7 +8,7 @@ |
8 | 8 | ||
9 | remote=$ONOS_USER@${1:-$OCI} | 9 | remote=$ONOS_USER@${1:-$OCI} |
10 | 10 | ||
11 | -ssh -t $remote " | 11 | +ssh $remote " |
12 | sudo service onos stop 1>/dev/null 2>/dev/null | 12 | sudo service onos stop 1>/dev/null 2>/dev/null |
13 | sudo rm -fr $ONOS_INSTALL_DIR | 13 | sudo rm -fr $ONOS_INSTALL_DIR |
14 | " | 14 | " | ... | ... |
-
Please register or login to post a comment