Skip to content

Commit

Permalink
0922 seems project_id was not there
Browse files Browse the repository at this point in the history
tenant_id only.
we might skip pushing into 9.8.
Although we could.

(cherry picked from commit efe9292)
  • Loading branch information
Niklaus-xie committed Sep 22, 2021
1 parent 17dbdee commit 31d77ae
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions f5_openstack_agent/lbaasv2/drivers/bigip/resource_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,8 @@ 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"]
Expand Down Expand Up @@ -1199,7 +1200,8 @@ 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"]
Expand Down

0 comments on commit 31d77ae

Please sign in to comment.