From 76cb969967330df3249304398a2ccd98dfc67c54 Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Thu, 31 Jan 2019 09:18:25 +0100 Subject: [PATCH] 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 --- charmhelpers/contrib/openstack/cert_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charmhelpers/contrib/openstack/cert_utils.py b/charmhelpers/contrib/openstack/cert_utils.py index 3e078703..3a3c6de7 100644 --- a/charmhelpers/contrib/openstack/cert_utils.py +++ b/charmhelpers/contrib/openstack/cert_utils.py @@ -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)