Revision 4111c53e
b/snf-cyclades-app/synnefo/api/management/commands/network-modify.py | ||
---|---|---|
161 | 161 |
floating_ip_pool = options["floating_ip_pool"] |
162 | 162 |
if floating_ip_pool is not None: |
163 | 163 |
floating_ip_pool = parse_bool(floating_ip_pool) |
164 |
options["floating_ip_pool"] = floating_ip_pool |
|
164 | 165 |
if floating_ip_pool is False and network.floating_ip_pool is True: |
165 | 166 |
if network.floating_ips.filter(deleted=False).exists(): |
166 | 167 |
msg = ("Can not make network a non floating IP pool. There are" |
b/snf-cyclades-app/synnefo/logic/reconciliation.py | ||
---|---|---|
56 | 56 |
""" |
57 | 57 |
|
58 | 58 |
|
59 |
from django.core.management import setup_environ |
|
60 | 59 |
from django.conf import settings |
61 | 60 |
|
62 | 61 |
import logging |
... | ... | |
258 | 257 |
self.log.warning("Server '%s' has unknown flavor.", server_id) |
259 | 258 |
return |
260 | 259 |
|
261 |
self.log.info("Server '%s' has flavor '%' in DB and '%s' in" |
|
260 |
self.log.info("Server '%s' has flavor '%s' in DB and '%s' in"
|
|
262 | 261 |
" Ganeti", server_id, db_flavor, gnt_flavor) |
263 | 262 |
if self.options["fix_unsynced_flavors"]: |
264 | 263 |
old_state = db_server.operstate |
... | ... | |
318 | 317 |
|
319 | 318 |
|
320 | 319 |
def format_db_nic(nic): |
321 |
return "Index: %s IP: %s Network: %s MAC: %s Firewall: %s" % (nic.index, |
|
320 |
return "Index: %s, IP: %s Network: %s MAC: %s Firewall: %s" % (nic.index,
|
|
322 | 321 |
nic.ipv4, nic.network_id, nic.mac, nic.firewall_profile) |
323 | 322 |
|
324 | 323 |
|
Also available in: Unified diff