openstack/zun
Code Issues Proposed changes

Merge "Pick shared network if no tenant network"

Browse Source
This commit is contained in:
Zuul 2018-01-19 09:18:26 +00:00 committed by Gerrit Code Review
commit d617f7b9c1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zun/network/neutron.py
View File

@ -35,7 +35,9 @@ class NeutronAPI(object):
def get_available_network(self):
search_opts = {'tenant_id': self.context.project_id, 'shared': False}
nets = self.list_networks(**search_opts).get('networks', [])
# NOTE(kiennt): Pick shared network if no tenant network
nets = self.list_networks(**search_opts).get('networks', []) or \
self.list_networks(**{'shared': True}).get('networks', [])
if not nets:
raise exception.Conflict(_(
"There is no neutron network available"))