openstack: ensure non-interactivity of custom YAML upload ssh

Fixes: https://github.com/SUSE/teuthology/issues/90
Signed-off-by: Nathan Cutler <ncutler@suse.com>

diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py
index df2e1235097fe9e14b8ec6120e258f9df002a515..21f1b53b5349f929d6fa5a8201f4cbc31033b094 100644 (file)
--- a/teuthology/openstack/__init__.py
+++ b/teuthology/openstack/__init__.py
@@ -562,8 +562,12 @@ class TeuthologyOpenStack(OpenStack):
         log.info("Detected local YAML file {}".format(fp))
         machine = self.username + "@" + self.instance.get_floating_ip_or_ip()
 
+        sshopts=('-o ConnectTimeout=3 -o UserKnownHostsFile=/dev/null '
+                 '-o StrictHostKeyChecking=no')
+
         def ssh_command(s):
-            return "ssh -i {k} {m} sh -c \\\"{s}\\\"".format(
+            return "ssh {o} -i {k} {m} sh -c \\\"{s}\\\"".format(
+                o=sshopts,
                 k=self.key_filename,
                 m=machine,
                 s=s,
@@ -595,7 +599,8 @@ class TeuthologyOpenStack(OpenStack):
             aug_dn=remote_dn,
         ))
         misc.sh(command) # will throw exception on failure
-        command = "scp -i {k} {yamlfile} {m}:{dn}".format(
+        command = "scp {o} -i {k} {yamlfile} {m}:{dn}".format(
+            o=sshopts,
             k=self.key_filename,
             yamlfile=fp,
             m=machine,