The transfer OS has never connected to the bootstrap OS before, so it's
silly to try to do host key checking. It just makes it ask for
confirmation partway through the process, and then the whole thing times
out when you don't notice.

Signed-off-by: Ben Lipton <[email protected]>
---
 p2v-transfer/p2v_transfer.py           |    3 ++-
 p2v-transfer/test/p2v_transfer_test.py |    6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/p2v-transfer/p2v_transfer.py b/p2v-transfer/p2v_transfer.py
index 20fd500..ddaee56 100755
--- a/p2v-transfer/p2v_transfer.py
+++ b/p2v-transfer/p2v_transfer.py
@@ -410,7 +410,8 @@ def TransferFiles(user, host, keyfile):
   """
   DisplayCommandStart("Transferring files. This will take a while...")
 
-  errcode = subprocess.call(["rsync", "-aHAXz", "-e", "ssh -i %s" % keyfile,
+  errcode = subprocess.call(["rsync", "-aHAXz", "-e",
+                             "ssh -i %s -o StrictHostKeyChecking=no" % keyfile,
                              "%s/" % SOURCE_MOUNT,
                              "%s@%s:%s" % (user, host, TARGET_MOUNT)])
   if errcode:
diff --git a/p2v-transfer/test/p2v_transfer_test.py 
b/p2v-transfer/test/p2v_transfer_test.py
index 5b0b0d7..503ba02 100755
--- a/p2v-transfer/test/p2v_transfer_test.py
+++ b/p2v-transfer/test/p2v_transfer_test.py
@@ -246,7 +246,8 @@ EOF
     user = "root"
     host = "instance"
     pkey = "keyfile"
-    command_list = ["rsync", "-aHAXz", "-e", "ssh -i %s" % pkey,
+    command_list = ["rsync", "-aHAXz", "-e",
+                    "ssh -i %s -o StrictHostKeyChecking=no" % pkey,
                     "%s/" % self.module.SOURCE_MOUNT,
                     "%s@%s:%s" % (user, host, self.module.TARGET_MOUNT)]
     self._MockSubprocessCallFailure(command_list)
@@ -258,7 +259,8 @@ EOF
     user = "root"
     host = "instance"
     pkey = "keyfile"
-    command_list = ["rsync", "-aHAXz", "-e", "ssh -i %s" % pkey,
+    command_list = ["rsync", "-aHAXz", "-e",
+                    "ssh -i %s -o StrictHostKeyChecking=no" % pkey,
                     "%s/" % self.module.SOURCE_MOUNT,
                     "%s@%s:%s" % (user, host, self.module.TARGET_MOUNT)]
     self._MockSubprocessCallSuccess(command_list)
-- 
1.7.3.1

Reply via email to