Updated onos src tree to commit id 1e60f97ae50c05b94fcb6a10520738bfb5efdfd1

1 files changed, 5 insertions, 3 deletions

diff --git a/framework/src/onos/tools/test/bin/onos-secure-ssh b/framework/src/onos/tools/test/bin/onos-secure-ssh
index 3c15fa3c..a3980e17 100755
--- a/framework/src/onos/tools/test/bin/onos-secure-ssh
+++ b/framework/src/onos/tools/test/bin/onos-secure-ssh
@@ -9,9 +9,6 @@
 nodes=$(env | sort | egrep "OC[0-9]+" | cut -d= -f2)
 
 for node in $nodes; do
-    # Setup passwordless login for the remote user on the local bench host
-    onos-user-key $node
-
     # Prune the node entry from the known hosts file since server key changes
     ssh-keygen -f "$HOME/.ssh/known_hosts" -R [$node]:8101
 
@@ -27,5 +24,10 @@ for node in $nodes; do
             sleep 1
         done
     "
+
+    # Setup passwordless login for the remote user on the local bench host
+    # For now, we let the local public key override the remote one
+    # TODO: fix username collision between workbench and the remote hosts
+    onos-user-key $node
 done