Skip to content

Commit 2a65798

Browse files
committed
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 efe9292)
1 parent 17dbdee commit 2a65798

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

f5_openstack_agent/lbaasv2/drivers/bigip/resource_manager.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,9 @@ def _check_nonshared_network(self, service):
249249
lb_net_id = loadbalancer['network_id']
250250
network = self.driver.service_adapter.get_network_from_service(
251251
service, lb_net_id)
252-
net_project_id = network["project_id"]
252+
net_project_id = network.get('project_id', None) or \
253+
network.get('tenant_id')
254+
LOG.debug(net_project_id)
253255

254256
if self.driver.conf.f5_global_routed_mode:
255257
shared = network["shared"]
@@ -1199,7 +1201,9 @@ def _check_nonshared_network(self, service):
11991201
meb_net_id = meb["network_id"]
12001202
network = self.driver.service_adapter.get_network_from_service(
12011203
service, meb_net_id)
1202-
net_project_id = network["project_id"]
1204+
net_project_id = network.get('project_id', None) or \
1205+
network.get('tenant_id')
1206+
LOG.debug(net_project_id)
12031207

12041208
if self.driver.conf.f5_global_routed_mode:
12051209
shared = network["shared"]

0 commit comments

Comments
 (0)