From 2a65798734f23b6e5f34a7d8808564c5aa400edb Mon Sep 17 00:00:00 2001 From: Niklaus Xie Date: Wed, 22 Sep 2021 14:47:54 +0800 Subject: [PATCH] project_id was not there tenant_id only. we might avoid pushing into 9.8 for now if we do not want to regress around here. Although we could. (cherry picked from commit efe9292d32c33c2ac37e79d5a8e58a49729bde6d) --- .../lbaasv2/drivers/bigip/resource_manager.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/f5_openstack_agent/lbaasv2/drivers/bigip/resource_manager.py b/f5_openstack_agent/lbaasv2/drivers/bigip/resource_manager.py index 916a4999e..4a85d3066 100644 --- a/f5_openstack_agent/lbaasv2/drivers/bigip/resource_manager.py +++ b/f5_openstack_agent/lbaasv2/drivers/bigip/resource_manager.py @@ -249,7 +249,9 @@ def _check_nonshared_network(self, service): lb_net_id = loadbalancer['network_id'] network = self.driver.service_adapter.get_network_from_service( service, lb_net_id) - net_project_id = network["project_id"] + net_project_id = network.get('project_id', None) or \ + network.get('tenant_id') + LOG.debug(net_project_id) if self.driver.conf.f5_global_routed_mode: shared = network["shared"] @@ -1199,7 +1201,9 @@ def _check_nonshared_network(self, service): meb_net_id = meb["network_id"] network = self.driver.service_adapter.get_network_from_service( service, meb_net_id) - net_project_id = network["project_id"] + net_project_id = network.get('project_id', None) or \ + network.get('tenant_id') + LOG.debug(net_project_id) if self.driver.conf.f5_global_routed_mode: shared = network["shared"]