summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2019-10-15 09:03:06 +0200
committerMichal Nasiadka <mnasiadka@gmail.com>2019-10-17 11:42:51 +0200
commit577697301f8682293a00a793807687df9d0ce679 (patch)
tree3be4608edadc7c8e7f65bf25bae7a8e4ba71bff3 /docker
parent97c78790897598890a51ee5677e2d39b37b147a3 (diff)
downloadkolla-577697301f8682293a00a793807687df9d0ce679.tar.gz
kolla-577697301f8682293a00a793807687df9d0ce679.zip
Fix fetch_ceph_keys to run in python3
Quick fix to convert bytes object to string, that can be serialized by JSON. Change-Id: I7d3db8e43eccc06aaf21e84990317133fa515a1f
Diffstat (limited to 'docker')
-rw-r--r--docker/ceph/ceph-mon/fetch_ceph_keys.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/ceph/ceph-mon/fetch_ceph_keys.py b/docker/ceph/ceph-mon/fetch_ceph_keys.py
index f0f4a7154..31af87eed 100644
--- a/docker/ceph/ceph-mon/fetch_ceph_keys.py
+++ b/docker/ceph/ceph-mon/fetch_ceph_keys.py
@@ -50,7 +50,7 @@ def read_file(filename):
raw_data = f.read()
# TODO(mnasiadka): Remove sha1 in U
- return {'content': base64.b64encode(zlib.compress(raw_data)),
+ return {'content': (base64.b64encode(zlib.compress(raw_data))).decode(),
'sha1': hashlib.sha1(raw_data).hexdigest(),
'sha256': hashlib.sha256(raw_data).hexdigest(),
'filename': filename}