From 67e59dbbfc2af16f4f4aa243615023eda1dfbb0b Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Fri, 23 Jun 2017 14:16:16 +0200 Subject: [PATCH] openstack: ensure non-interactivity of custom YAML upload ssh Fixes: https://github.com/SUSE/teuthology/issues/90 Signed-off-by: Nathan Cutler --- teuthology/openstack/__init__.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py index df2e123509..21f1b53b53 100644 --- 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, -- 2.39.5