]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/cephadm.py: decode data returned by teuthology.get_file()
authorKefu Chai <kchai@redhat.com>
Tue, 7 Apr 2020 15:05:30 +0000 (23:05 +0800)
committerKefu Chai <kchai@redhat.com>
Sun, 14 Jun 2020 08:34:52 +0000 (16:34 +0800)
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)

qa/tasks/cephadm.py

index 9d23883df13feff6ffcc44bdba62f1f40be1d8e3..4199e59718fcdf3c1993148d6f07a8b0fde5c8d5 100644 (file)
@@ -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=[