Revision 8f2aa316
b/snf-cyclades-app/synnefo/logic/backend_allocator.py | ||
---|---|---|
32 | 32 |
from django.utils import importlib |
33 | 33 |
|
34 | 34 |
from synnefo.settings import (BACKEND_ALLOCATOR_MODULE, BACKEND_REFRESH_MIN, |
35 |
BACKEND_PER_USER, ARCHIPELAGO_BACKENDS) |
|
35 |
BACKEND_PER_USER, ARCHIPELAGO_BACKENDS, |
|
36 |
DEFAULT_INSTANCE_NETWORKS) |
|
36 | 37 |
from synnefo.db.models import Backend |
37 | 38 |
from synnefo.logic.backend import update_resources |
38 | 39 |
from synnefo.api.util import backend_public_networks |
... | ... | |
101 | 102 |
""" |
102 | 103 |
backends = list(Backend.objects.select_for_update().filter(drained=False, |
103 | 104 |
offline=False)) |
104 |
return filter(lambda x: has_free_ip(x), backends) |
|
105 |
if "SNF:ANY_PUBLIC" in DEFAULT_INSTANCE_NETWORKS: |
|
106 |
backends = filter(lambda x: has_free_ip(x), backends) |
|
107 |
return backends |
|
105 | 108 |
|
106 | 109 |
|
107 | 110 |
def filter_archipelagos_backends(available_backends, disk_template): |
Also available in: Unified diff