openstack
/
charm-glance
Code Issues Proposed changes

c-h: Separate certificates with lineseparator in bundles 

Cherry-pick specific fix for charm-helpers already synced
into master.

Change-Id: If8bd06c867fbe9e920826b9268a0d388e987b298
Closes-Bug: #1813982
This commit is contained in:
Frode Nordahl 2019-01-31 09:18:25 +01:00
parent f136e4d68c
commit 76cb969967
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charmhelpers/contrib/openstack/cert_utils.py
View File

@ -195,7 +195,7 @@ def install_certs(ssl_dir, certs, chain=None):
if chain:
# Append chain file so that clients that trust the root CA will
# trust certs signed by an intermediate in the chain
cert_data = cert_data + chain
cert_data = cert_data + os.linesep + chain
write_file(
path=os.path.join(ssl_dir, cert_filename),
content=cert_data, perms=0o640)