From: zhifeng.jiang <jiang.zhifeng@zte.com.cn>
Date: Fri, 22 Apr 2016 16:29:49 +0000 (-0400)
Subject: Patch the ssh-copy-id in fuel 9.0.
X-Git-Tag: danube.1.0~335^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F87%2F12587%2F3;p=qtip.git

Patch the ssh-copy-id in fuel 9.0.

JIRA:QTIP-69

Change-Id: I14066b15247431780b5df1efebcb8cc4232d3761
Co-Authored-By: yujun.zhang <zhang.yujunz@zte.com.cn>
Signed-off-by: zhifeng.jiang <jiang.zhifeng@zte.com.cn>
---

diff --git a/data/qtip_creds.sh b/data/qtip_creds.sh
index bf316b4d..6f19305a 100755
--- a/data/qtip_creds.sh
+++ b/data/qtip_creds.sh
@@ -14,7 +14,8 @@ case "$INSTALLER_TYPE" in
         PSWD="r00tme"
         sshpass -p $PSWD scp $sshoptions ./data/QtipKey.pub root@$INSTALLER_IP:/root
         sshpass -p $PSWD scp $sshoptions ./data/QtipKey root@$INSTALLER_IP:/root
-        sshpass -p $PSWD ssh $sshoptions root@$INSTALLER_IP "ssh-copy-id $sshoptions -i /root/QtipKey.pub root@$DEST_IP && rm -rf /root/QtipKey && rm -rf /root/QtipKey.pub"
+        sshpass -p $PSWD ssh $sshoptions root@$INSTALLER_IP "grep -q '\-F /dev/null ' /usr/bin/ssh-copy-id || sed -i 's/\(ssh -i.*$\)/\1\n            -F \/dev\/null \\\/g' `which ssh-copy-id`"
+        sshpass -p $PSWD ssh $sshoptions root@$INSTALLER_IP "ssh-copy-id $sshoptions -i /root/QtipKey root@$DEST_IP && rm -rf /root/QtipKey && rm -rf /root/QtipKey.pub"
         ;;
     compass)
         PSWD="root"