summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorzhifeng.jiang <jiang.zhifeng@zte.com.cn>2016-04-22 12:29:49 -0400
committerzhifeng jiang <jiang.zhifeng@zte.com.cn>2016-06-16 14:31:42 +0000
commit377320821b27e378a4d0065d8bcbf282e6ce2be9 (patch)
treedc8871a3f5e50f6249808247de8837eb712db6f0 /data
parent5017e823b109621729b69e9fde251f3eb66db298 (diff)
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>
Diffstat (limited to 'data')
-rwxr-xr-xdata/qtip_creds.sh3
1 files changed, 2 insertions, 1 deletions
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"