requested chnge

Author: Richard Stempfl

templates/network.xml.j2

@@ -3,29 +3,27 @@
   {% if item.mode is defined %}<forward mode='{{ item.mode }}'/>{% endif %}
   <bridge name='{{ item.bridge }}'/>
 {% if item.mode is defined %}
-  {% if item.mode == 'route' or item.mode == 'nat' %}
   <domain name='{{ item.domain|default(item.name) }}'/>
   <ip address='{{ item.ip }}' netmask='{{ item.netmask }}'>
-    {% if item.dhcp_start is defined and item.dhcp_end is defined %}
+  {% if item.dhcp_start is defined and item.dhcp_end is defined %}
   <dhcp>
     <range start='{{ item.dhcp_start }}' end='{{ item.dhcp_end }}'/>
   </dhcp>
-    {% endif %}
+  {% endif %}
   </ip>
-    {% if item.routes is defined %}
-    {% for route in item.routes %}
+  {% if item.routes is defined %}
+  {% for route in item.routes %}
     <route address="{{ route.address }}" prefix="{{ route.prefix }}" gateway="{{ route.gateway }}" {% if route.metric is defined %} metric='{{ route.metric }}' {% endif %}/>
-    {% endfor %}
-    {% endif %}
-    {% if item.ipv6 is defined and item.ipv6_prefix is defined %}
+  {% endfor %}
+  {% endif %}
+  {% if item.ipv6 is defined and item.ipv6_prefix is defined %}
   <ip family='ipv6' address='{{ item.ipv6 }}' prefix='{{ item.ipv6_prefix }}'>
   </ip>
-    {% endif %}
-    {% if item.routesv6 is defined %}
-    {% for route in item.routesv6 %}
+  {% endif %}
+  {% if item.routesv6 is defined %}
+  {% for route in item.routesv6 %}
     <route family="ipv6" address="{{ route.address }}" prefix="{{ route.prefix }}" gateway="{{ route.gateway }}" {% if route.metric is defined %} metric='{{ route.metric }}' {% endif %}/>
-    {% endfor %}
-    {% endif %}
+  {% endfor %}
   {% endif %}
 {% else %}
   <domain name='{{ item.domain|default(item.name) }}'/>