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:
parent
946ee47cf0
commit
6a050f5b3c
|
@ -387,12 +387,18 @@ class OpenStackCharm(BaseOpenStackCharm,
|
||||||
if self.config_defined_ssl_key and self.config_defined_ssl_cert:
|
if self.config_defined_ssl_key and self.config_defined_ssl_cert:
|
||||||
ssl_artifacts = []
|
ssl_artifacts = []
|
||||||
for ep_type in [os_ip.INTERNAL, os_ip.ADMIN, os_ip.PUBLIC]:
|
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({
|
ssl_artifacts.append({
|
||||||
'key': self.config_defined_ssl_key.decode('utf-8'),
|
'key': self.config_defined_ssl_key.decode('utf-8'),
|
||||||
'cert': self.config_defined_ssl_cert.decode('utf-8'),
|
'cert': self.config_defined_ssl_cert.decode('utf-8'),
|
||||||
'ca': (self.config_defined_ssl_ca.decode('utf-8')
|
'ca': (self.config_defined_ssl_ca.decode('utf-8')
|
||||||
if self.config_defined_ssl_ca else None),
|
if self.config_defined_ssl_ca else None),
|
||||||
'cn': os_ip.resolve_address(endpoint_type=ep_type)})
|
'cn': cn})
|
||||||
return ssl_artifacts
|
return ssl_artifacts
|
||||||
elif certificates_interface:
|
elif certificates_interface:
|
||||||
keys_and_certs = []
|
keys_and_certs = []
|
||||||
|
|
Loading…
Reference in New Issue