openstack
/
charms.openstack
Code Issues Proposed changes

Skip bindings that don't exist 

When fetching CNs from bindings, skip those that are not
available since not all charms have all bindings.

Closes-Bug: 1913313
Change-Id: Iad9616d3f8668782cd9c7dc498120536fb756da7
This commit is contained in:
Edward Hope-Morley 2021-01-26 14:44:20 +00:00
parent 946ee47cf0
commit 6a050f5b3c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
charms_openstack/charm/classes.py
View File

@ -387,12 +387,18 @@ class OpenStackCharm(BaseOpenStackCharm,
if self.config_defined_ssl_key and self.config_defined_ssl_cert:
ssl_artifacts = []
for ep_type in [os_ip.INTERNAL, os_ip.ADMIN, os_ip.PUBLIC]:
# Not all charms have all bindings to skip if unavailable
try:
cn = os_ip.resolve_address(endpoint_type=ep_type)
except hookenv.NoNetworkBinding:
continue
ssl_artifacts.append({
'key': self.config_defined_ssl_key.decode('utf-8'),
'cert': self.config_defined_ssl_cert.decode('utf-8'),
'ca': (self.config_defined_ssl_ca.decode('utf-8')
if self.config_defined_ssl_ca else None),
'cn': os_ip.resolve_address(endpoint_type=ep_type)})
'cn': cn})
return ssl_artifacts
elif certificates_interface:
keys_and_certs = []