starlingx
/
config
Code Issues Proposed changes

Merge "py3: fix manager.py _get_public_bytes() to handle bytes" into f/centos8

This commit is contained in:
Zuul 2021-08-18 20:57:28 +00:00 committed by Gerrit Code Review
parent 5677c883f4 c734b75958
commit 3b9d99818c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysinv/sysinv/sysinv/sysinv/conductor/manager.py
View File

@ -11559,9 +11559,9 @@ class ConductorManager(service.PeriodicService):
# Concatenate all the public bytes together, as the pem contents
# may contain intermediate CA certs in it.
public_bytes = ''
public_bytes = b''
for cert in cert_list:
public_bytes += cert.get('public_bytes', '')
public_bytes += cert.get('public_bytes', b'')
return public_bytes