From 2edbbf259a43947045b14c3676ec158bf5048f4f Mon Sep 17 00:00:00 2001 From: Tabitha Date: Thu, 25 Feb 2021 10:47:30 +0100 Subject: [PATCH] Fixes the if-else-block bug The SCTP version check was placed above the else block of Octavia-tags version check, this patch fixes that. Change-Id: Icef8645baa7cba731b76814abdb63be556172ef7 --- kuryr_kubernetes/controller/drivers/lbaasv2.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kuryr_kubernetes/controller/drivers/lbaasv2.py b/kuryr_kubernetes/controller/drivers/lbaasv2.py index e869db41f..c2b02428b 100644 --- a/kuryr_kubernetes/controller/drivers/lbaasv2.py +++ b/kuryr_kubernetes/controller/drivers/lbaasv2.py @@ -81,9 +81,6 @@ class LBaaSv2Driver(base.LBaaSDriver): if v >= _OCTAVIA_TAGGING_VERSION: LOG.info('Octavia supports resource tags.') self._octavia_tags = True - if v >= _OCTAVIA_SCTP_VERSION: - LOG.info('Octavia API supports SCTP protocol.') - self._octavia_sctp = True else: v_str = '%d.%d' % v LOG.warning('[neutron_defaults]resource_tags is set, but Octavia ' @@ -92,6 +89,9 @@ class LBaaSv2Driver(base.LBaaSDriver): 'Octavia resources.', v_str) if v >= _OCTAVIA_PROVIDER_VERSION: self._octavia_providers = True + if v >= _OCTAVIA_SCTP_VERSION: + LOG.info('Octavia API supports SCTP protocol.') + self._octavia_sctp = True def double_listeners_supported(self): return self._octavia_double_listeners