From c734b759589eb47054b7c320acb452b375487c6e Mon Sep 17 00:00:00 2001 From: Fabricio Henrique Ramos Date: Wed, 18 Aug 2021 10:46:38 -0300 Subject: [PATCH] py3: fix manager.py _get_public_bytes() to handle bytes Fix manager.py _get_public_bytes() to use variable of type bytes instead of str, avoiding issues when concatanating str and bytes in py3. Story: 2008454 Task: 43042 Change-Id: Id18e5ff32104b57f2602569c4489d3ffce0c33b7 Signed-off-by: Fabricio Henrique Ramos --- sysinv/sysinv/sysinv/sysinv/conductor/manager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sysinv/sysinv/sysinv/sysinv/conductor/manager.py b/sysinv/sysinv/sysinv/sysinv/conductor/manager.py index 7aa3194a5f..3c12ebb6a8 100644 --- a/sysinv/sysinv/sysinv/sysinv/conductor/manager.py +++ b/sysinv/sysinv/sysinv/sysinv/conductor/manager.py @@ -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