From: Kefu Chai <kchai@redhat.com>
Date: Tue, 7 Apr 2020 15:05:30 +0000 (+0800)
Subject: qa/tasks/cephadm.py: decode data returned by teuthology.get_file()
X-Git-Tag: v15.2.4~42^2~77
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ba17a0f61988dc9bedc5428c821b5af2f35a2d16;p=ceph.git

qa/tasks/cephadm.py: decode data returned by teuthology.get_file()

it's used as part of the command line sent to shell, so we need to
decode it first.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 6eb57a2a4fc63771096f8fd08c02b2bda49c9301)
---

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index 9d23883df13f..4199e59718fc 100644
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -398,7 +398,7 @@ def ceph_bootstrap(ctx, config):
         ssh_pub_key = teuthology.get_file(
             remote=bootstrap_remote,
             path='{}/{}.pub'.format(testdir, cluster_name)
-        ).strip()
+        ).decode('ascii').strip()
 
         log.info('Installing pub ssh key for root users...')
         ctx.cluster.run(args=[