openstack/charms.openstack
Code Issues Proposed changes

Fix certificate chain concatenation

Browse Source 
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
This commit is contained in:
David Ames 2019-02-01 15:05:32 -08:00
parent 44faa0e73b
commit 982ae33054
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charms_openstack/charm/classes.py
View File

@ -310,7 +310,7 @@ class OpenStackCharm(BaseOpenStackCharm,
for cn, data in sorted(reqs.items()): for cn, data in sorted(reqs.items()):
cert = data['cert'] cert = data['cert']
if chain: if chain:
cert = cert + chain cert = cert + os.linesep + chain
keys_and_certs.append({ keys_and_certs.append({
'key': data['key'], 'key': data['key'],
'cert': cert, 'cert': cert,

8
unit_tests/charms_openstack/charm/test_classes.py
View File

@ -855,22 +855,22 @@ class TestHAOpenStackCharm(BaseOpenStackCharmTest):
expect = [ expect = [
{ {
'ca': 'CA', 'ca': 'CA',
'cert': 'admin_certCHAIN', 'cert': 'admin_cert\nCHAIN',
'cn': 'admin_addr', 'cn': 'admin_addr',
'key': 'admin_key'}, 'key': 'admin_key'},
{ {
'ca': 'CA', 'ca': 'CA',
'cert': 'int_certCHAIN', 'cert': 'int_cert\nCHAIN',
'cn': 'int_addr', 'cn': 'int_addr',
'key': 'int_key'}, 'key': 'int_key'},
{ {
'ca': 'CA', 'ca': 'CA',
'cert': 'priv_certCHAIN', 'cert': 'priv_cert\nCHAIN',
'cn': 'priv_addr', 'cn': 'priv_addr',
'key': 'priv_key'}, 'key': 'priv_key'},
{ {
'ca': 'CA', 'ca': 'CA',
'cert': 'pub_certCHAIN', 'cert': 'pub_cert\nCHAIN',
'cn': 'pub_addr', 'cn': 'pub_addr',
'key': 'pub_key'}, 'key': 'pub_key'},
] ]