From 13d1cfced7db4249e79c8eeb385e635660b17a6f Mon Sep 17 00:00:00 2001 From: Andrew Karpow Date: Wed, 5 Jun 2024 20:17:55 +0200 Subject: [PATCH] [as3/tenant] raise error on any exception, including barbican retry instead skip listener --- octavia_f5/restclient/as3objects/tenant.py | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/octavia_f5/restclient/as3objects/tenant.py b/octavia_f5/restclient/as3objects/tenant.py index 858d3df1..2077f31b 100644 --- a/octavia_f5/restclient/as3objects/tenant.py +++ b/octavia_f5/restclient/as3objects/tenant.py @@ -16,7 +16,6 @@ from oslo_log import log as logging from octavia_lib.common import constants as lib_consts -from octavia.common import exceptions as o_exceptions from octavia_f5.common import constants from octavia_f5.restclient import as3classes as as3 from octavia_f5.restclient.as3classes import Application @@ -62,18 +61,8 @@ def get_tenant(segmentation_id, loadbalancers, self_ips, status_manager, cert_ma # Attach Octavia listeners as AS3 service objects for listener in loadbalancer.listeners: if not driver_utils.pending_delete(listener): - try: - service_entities = m_service.get_service(listener, cert_manager, esd_repo) - app.add_entities(service_entities) - except o_exceptions.CertificateRetrievalException as e: - if getattr(e, 'status_code', 0) != 400: - # Error connecting to keystore, skip tenant update - raise e - - LOG.error("Could not retrieve certificate, assuming it is deleted, skipping listener '%s': %s", listener.id, e) - if status_manager: - # Key / Container not found in keystore - status_manager.set_error(listener) + service_entities = m_service.get_service(listener, cert_manager, esd_repo) + app.add_entities(service_entities) # Attach pools for pool in loadbalancer.pools: