Revision d1b1e683 snf-cyclades-app/synnefo/logic/management/commands/reconcile-networks.py

b/snf-cyclades-app/synnefo/logic/management/commands/reconcile-networks.py
39 39

  
40 40
from optparse import make_option
41 41

  
42
from synnefo.settings import PUBLIC_ROUTED_USE_POOL
42
from synnefo.settings import PUBLIC_USE_POOL
43 43
from django.core.management.base import BaseCommand
44 44
from django.db import transaction
45 45

  
......
87 87
    for network in networks:
88 88
        net_id = network.id
89 89
        destroying = network.action == 'DESTROY'
90
        uses_pool = not (network.type == 'PUBLIC_ROUTED' and (not
91
                        PUBLIC_ROUTED_USE_POOL))
90
        uses_pool = not network.public or PUBLIC_USE_POOL
92 91
        ip_available_maps = []
93 92
        ip_reserved_maps = []
94 93

  

Also available in: Unified diff