summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNauman Ahad <nauman.ahad@xflowresearch.com>2016-06-20 20:51:48 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-20 20:51:48 +0000
commit89610f7b65f48ec4da68aab234bf91cca5b6473f (patch)
tree14cda922f45b1e536372b64c4f32344b0f88a5e7
parentb53c80415ae8e471cf1a59be26dbe572733e8946 (diff)
parent377320821b27e378a4d0065d8bcbf282e6ce2be9 (diff)
Merge "Patch the ssh-copy-id in fuel 9.0."
-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"