openstack
/
octavia
Code Issues Proposed changes

Merge "Add line terminator to certificate list file"

This commit is contained in:
Zuul 2020-08-11 19:48:45 +00:00 committed by Gerrit Code Review
parent fc6a9ce805 13fe928c8a
commit aa52cb39ca
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
octavia/amphorae/drivers/haproxy/rest_api_driver.py
View File

@ -477,7 +477,8 @@ class HaproxyAmphoraLoadBalancerDriver(
if certs:
# Build and upload the crt-list file for haproxy
crt_list = "\n".join(cert_filename_list).encode('utf-8')
crt_list = "\n".join(cert_filename_list)
crt_list = f'{crt_list}\n'.encode('utf-8')
md5 = hashlib.md5(crt_list).hexdigest() # nosec
name = '{id}.pem'.format(id=listener.id)
self._upload_cert(amphora, obj_id, crt_list, md5, name)