From: Joseph McDonald <joseph.mcdonald@alcatel-lucent.com>
Date: Mon, 1 Jun 2015 22:00:39 +0000 (-0700)
Subject: ceph-post-file: behave when sftp doesn't take -i
X-Git-Tag: v0.80.11~77^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50bfb354d0648162f94c2659e8b915d69f27bf73;p=ceph.git

ceph-post-file: behave when sftp doesn't take -i

Fixes: #11836
Signed-off-by: Joseph McDonald <joseph.mcdonald@alcatel-lucent.com>
(cherry picked from commit b84031ed5eaace1222e14d3c4076a3ab1155da96)
---

diff --git a/src/ceph-post-file.in b/src/ceph-post-file.in
index 9b922a6c941..fed1666ae8f 100755
--- a/src/ceph-post-file.in
+++ b/src/ceph-post-file.in
@@ -155,7 +155,7 @@ done
 cp "$ssh_key" "$t4"
 cp "${ssh_key}.pub" "$t4.pub"
 
-sftp -i $t4 \
+sftp -o "IdentityFile=$t4" \
     -C \
     -oCheckHostIP=no \
     -oGlobalKnownHostsFile=$known_hosts \