openstack/kuryr-kubernetes
Code Issues Proposed changes

Merge "Support None from Octavia get_api_major_version()"

Browse Source
This commit is contained in:
Zuul
2019-07-01 19:17:18 +00:00
committed by Gerrit Code Review
parent 0cea1e3eeb 446a73fc69
commit e24126be08
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,10 +69,14 @@ class LBaaSv2Driver(base.LBaaSDriver):
LOG.info('Octavia supports resource tags.') LOG.info('Octavia supports resource tags.')
self._octavia_tags = True self._octavia_tags = True
else: else:
if v is None:
v_str = 'unknown'
else:
v_str = '%d.%d' % v
LOG.warning('[neutron_defaults]resource_tags is set, but Octavia ' LOG.warning('[neutron_defaults]resource_tags is set, but Octavia '
'API %d.%d does not support resource tagging. Kuryr ' 'API %s does not support resource tagging. Kuryr '
'will put requested tags in the description field of ' 'will put requested tags in the description field of '
'Octavia resources.', *v) 'Octavia resources.', v_str)
def get_service_loadbalancer_name(self, namespace, svc_name): def get_service_loadbalancer_name(self, namespace, svc_name):
return "%s/%s" % (namespace, svc_name) return "%s/%s" % (namespace, svc_name)