Skip to content

Commit

Permalink
Support Mitaka
Browse files Browse the repository at this point in the history
  • Loading branch information
zhaoqin-github committed Jul 7, 2021
1 parent 3cd7679 commit 1191bea
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 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,11 @@ 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"]
if "project_id" in network:
net_project_id = network["project_id"]
else:
# Mitaka compatibility
net_project_id = network["tenant_id"]

if self.driver.conf.f5_global_routed_mode:
shared = network["shared"]
Expand Down Expand Up @@ -1184,7 +1188,11 @@ 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"]
if "project_id" in network:
net_project_id = network["project_id"]
else:
# Mitaka compatibility
net_project_id = network["tenant_id"]

if self.driver.conf.f5_global_routed_mode:
shared = network["shared"]
Expand Down

0 comments on commit 1191bea

Please sign in to comment.