From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Fri, 29 May 2020 10:23:58 +0000 (+0200)
Subject: qa/cephadm: sudo_write_file doesn't support unicode
X-Git-Tag: v15.2.4~83^2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=76524358594a00ef2e7a1acf4e186aae9d39d4d8;p=ceph.git

qa/cephadm: sudo_write_file doesn't support unicode

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index 879461170cf2..e6cbf9e70370 100644
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -12,6 +12,7 @@ import json
 import re
 import uuid
 
+import six
 import toml
 from ceph_manager import CephManager
 from tarfile import ReadError
@@ -1160,7 +1161,7 @@ def add_mirror_to_cluster(ctx, mirror):
             teuthology.sudo_write_file(
                 remote=remote,
                 path=registries_conf,
-                data=new_config,
+                data=six.ensure_str(new_config),
             )
         except FileNotFoundError as e:
             # Docker doesn't ship a registries.conf