From 377320821b27e378a4d0065d8bcbf282e6ce2be9 Mon Sep 17 00:00:00 2001 From: "zhifeng.jiang" Date: Fri, 22 Apr 2016 12:29:49 -0400 Subject: Patch the ssh-copy-id in fuel 9.0. JIRA:QTIP-69 Change-Id: I14066b15247431780b5df1efebcb8cc4232d3761 Co-Authored-By: yujun.zhang Signed-off-by: zhifeng.jiang --- data/qtip_creds.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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" -- cgit 1.2.3-korg