]> 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>
Tue, 7 Apr 2020 15:06:20 +0000 (23:06 +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>
qa/tasks/cephadm.py

index 5703c7ad27227ba0c4b7bebbaa3be7887a7bf550..1ffd02553dceb60950cc2e5d0d383d516611f69b 100644 (file)
@@ -391,7 +391,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=[