diff options
| author | Zuul <zuul@review.opendev.org> | 2019-10-18 18:14:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-10-18 18:14:02 +0000 |
| commit | d333b54e7ecac73372348fd9ddf34849e00af223 (patch) | |
| tree | effabb5901c91914281a444576dcc142b5c4ccbe /docker | |
| parent | eee5c08484e42105070cfca73b5647673d6a2092 (diff) | |
| parent | 577697301f8682293a00a793807687df9d0ce679 (diff) | |
| download | kolla-d333b54e7ecac73372348fd9ddf34849e00af223.tar.gz kolla-d333b54e7ecac73372348fd9ddf34849e00af223.zip | |
Merge "Fix fetch_ceph_keys to run in python3"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ceph/ceph-mon/fetch_ceph_keys.py | 2 |
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} |