do not load tap ip information from xml if the option is disabled

5029f941 · Alain Takoudjou · 1dd08722 · 5029f941
Commit 5029f941 authored Mar 25, 2015 by Alain Takoudjou
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

slapos/format.py slapos/format.py +5 -4

No files found.
--- a/slapos/format.py
+++ b/slapos/format.py
@@ -383,10 +383,11 @@ class Computer(object):
      if partition_dict['tap']:
        tap = Tap(partition_dict['tap']['name'])
-        tap.ipv4_addr = partition_dict['tap'].get('ipv4_addr', '')
+        if tap_gateway_interface:
-        tap.ipv4_netmask = partition_dict['tap'].get('ipv4_netmask', '')
+          tap.ipv4_addr = partition_dict['tap'].get('ipv4_addr', '')
-        tap.ipv4_gateway = partition_dict['tap'].get('ipv4_gateway', '')
+          tap.ipv4_netmask = partition_dict['tap'].get('ipv4_netmask', '')
-        tap.ipv4_network = partition_dict['tap'].get('ipv4_network', '')
+          tap.ipv4_gateway = partition_dict['tap'].get('ipv4_gateway', '')
+          tap.ipv4_network = partition_dict['tap'].get('ipv4_network', '')
      else:
        tap = Tap(partition_dict['reference'])