Skip to content

[pull] master from galaxyproject:master #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 15, 2022
Merged

[pull] master from galaxyproject:master #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions django-cloudlaunch/cloudlaunch/backend_plugins/base_vm_app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,15 @@ def _setup_networking(self, provider, net_id, subnet_id, placement):
provider, net_id, placement)
# Make sure the subnet has Internet connectivity
try:
found_routers = [router for router in provider.networking.routers
if router.network_id == subnet.network_id]
# This will allow to re-use a router when subnets from multiple networks are attached to it
# xref: https://github.com/galaxyproject/cloudlaunch/pull/261
if provider.PROVIDER_ID == 'openstack':
found_routers = [router for router in provider.networking.routers
if subnet.network_id in [port.network_id for port in
provider.os_conn.list_ports(filters={'device_id': self.id})]]
else:
found_routers = [router for router in provider.networking.routers
if router.network_id == subnet.network_id]
# Check if the subnet's network is connected to a router
router = None
for r in found_routers:
Expand Down