openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Merge "Fix Listener timeouts update"

This commit is contained in:
Zuul 2021-06-07 16:23:09 +00:00 committed by Gerrit Code Review
parent 024f38d498 b24380b4ae
commit 530e624a3a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kuryr_kubernetes/controller/drivers/lbaasv2.py
View File

@ -623,7 +623,6 @@ class LBaaSv2Driver(base.LBaaSDriver):
try: try:
os_listener = next(response) os_listener = next(response)
listener['id'] = os_listener.id listener['id'] = os_listener.id
n_listen = None
if os_listener.provisioning_status == 'ERROR': if os_listener.provisioning_status == 'ERROR':
LOG.debug("Releasing listener %s", os_listener.id) LOG.debug("Releasing listener %s", os_listener.id)
self.release_listener(loadbalancer, listener) self.release_listener(loadbalancer, listener)
@ -632,12 +631,13 @@ class LBaaSv2Driver(base.LBaaSDriver):
os_listener.timeout_client_data != timeout_cli)) or ( os_listener.timeout_client_data != timeout_cli)) or (
timeout_mb and ( timeout_mb and (
os_listener.timeout_member_data != timeout_mb)): os_listener.timeout_member_data != timeout_mb)):
LOG.debug("Updating listener %s", os_listener.id)
n_listen = lbaas.update_listener(os_listener.id, **request) n_listen = lbaas.update_listener(os_listener.id, **request)
elif not timeout_cli or not timeout_mb:
n_listen = lbaas.update_listener(os_listener.id, **request)
if n_listen:
listener['timeout_client_data'] = n_listen.timeout_client_data listener['timeout_client_data'] = n_listen.timeout_client_data
listener['timeout_member_data'] = n_listen.timeout_member_data listener['timeout_member_data'] = n_listen.timeout_member_data
elif not timeout_cli or not timeout_mb:
LOG.debug("Updating listener %s", os_listener.id)
lbaas.update_listener(os_listener.id, **request)
except (KeyError, StopIteration): except (KeyError, StopIteration):
return None return None