From: Fatih Degirmenci <fdegir@gmail.com>
Date: Wed, 28 Feb 2018 15:11:38 +0000 (+0000)
Subject: Fix the proxy command and hostname for opnfv vm in ssh config
X-Git-Tag: 6.0.0~144
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F37%2F52837%2F1;p=releng-xci.git

Fix the proxy command and hostname for opnfv vm in ssh config

Change-Id: Ic036a4f5ef8b24b88154f9314957339d3954839a
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
---

diff --git a/xci/scripts/vm/start-new-vm.sh b/xci/scripts/vm/start-new-vm.sh
index 4f15f917..31c7337e 100755
--- a/xci/scripts/vm/start-new-vm.sh
+++ b/xci/scripts/vm/start-new-vm.sh
@@ -288,10 +288,11 @@ Host *_xci_vm
 User devuser
 
 Host *_xci_vm_opnfv
+Hostname 192.168.122.2
 User root
 TCPKeepAlive yes
 StrictHostKeyChecking no
-ProxyCommand ssh -l devuser \$(echo %h | sed 's/_opnfv//') 'nc 192.168.122.2 %p'
+ProxyCommand ssh -l devuser -i ${BASE_PATH}/xci/scripts/vm/id_rsa_for_dib ${OS}_xci_vm -W %h:%p
 EOF
 
 # Final ssh command which will also test the configuration file