From 982ae33054e57c8f64095ebbfbb187a181db13e6 Mon Sep 17 00:00:00 2001 From: David Ames Date: Fri, 1 Feb 2019 15:05:32 -0800 Subject: [PATCH] Fix certificate chain concatenation The reactive OpenStack charms do not use charmhelpers.contrib.openstack.cert_utils.install_certs when related to the certificates relation with vault. The same bug exists in charms.openstack.charms.classes.OpenStackCharm.get_certs_and_keys when the certificates_interface is in use. This change applies the same fix. Change-Id: I530d1efd2f847ec282a6b9cc7c4bfcf7b317b42d Closes-Bug: #1813982 --- charms_openstack/charm/classes.py | 2 +- unit_tests/charms_openstack/charm/test_classes.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charms_openstack/charm/classes.py b/charms_openstack/charm/classes.py index 642a207..dbf244f 100644 --- a/charms_openstack/charm/classes.py +++ b/charms_openstack/charm/classes.py @@ -310,7 +310,7 @@ class OpenStackCharm(BaseOpenStackCharm, for cn, data in sorted(reqs.items()): cert = data['cert'] if chain: - cert = cert + chain + cert = cert + os.linesep + chain keys_and_certs.append({ 'key': data['key'], 'cert': cert, diff --git a/unit_tests/charms_openstack/charm/test_classes.py b/unit_tests/charms_openstack/charm/test_classes.py index 0d281ea..c6a99c4 100644 --- a/unit_tests/charms_openstack/charm/test_classes.py +++ b/unit_tests/charms_openstack/charm/test_classes.py @@ -855,22 +855,22 @@ class TestHAOpenStackCharm(BaseOpenStackCharmTest): expect = [ { 'ca': 'CA', - 'cert': 'admin_certCHAIN', + 'cert': 'admin_cert\nCHAIN', 'cn': 'admin_addr', 'key': 'admin_key'}, { 'ca': 'CA', - 'cert': 'int_certCHAIN', + 'cert': 'int_cert\nCHAIN', 'cn': 'int_addr', 'key': 'int_key'}, { 'ca': 'CA', - 'cert': 'priv_certCHAIN', + 'cert': 'priv_cert\nCHAIN', 'cn': 'priv_addr', 'key': 'priv_key'}, { 'ca': 'CA', - 'cert': 'pub_certCHAIN', + 'cert': 'pub_cert\nCHAIN', 'cn': 'pub_addr', 'key': 'pub_key'}, ]