Conflicted resolved by merging changes

README.rst

@@ -75,6 +75,8 @@ Authors
 
 * Alan Pearce <alan@alanpearce.co.uk>
 * Arnold Bechtoldt <mail@arnoldbechtoldt.com>
+* Krzysztof Pawłowski <krzysztof.pawlowski@firma.interia.pl>
+* René Jochum <rene@jochums.at>
 * Simon Lloyd <simon@slloyd.net>
 * root <root@saltmaster01.(none)>
 

network/defaults.yaml

@@ -20,6 +20,7 @@ Debian:
       - pre_down_cmds
       - post_up_cmds
       - post_down_cmds
+      - noifupdown
       {#- bonding #}
       - master
       - mode
@@ -31,6 +32,7 @@ Debian:
       - ipv6ipaddr
       - ipv6netmask
       - ipv6gateway
+      - mtu 
     def_entries:
       - name: lo
         proto: loopback
@@ -82,6 +84,7 @@ RedHat:
       - pre_down_cmds
       - post_up_cmds
       - post_down_cmds
+      - noifupdown
       {#- bonding #}
       - master
       - mode
@@ -105,6 +108,7 @@ RedHat:
       - ipv6_peerdns
       - ipv6_defroute
       - ipv6_peerroutes
+      - mtu
     def_entries: []
 #      - name: lo
 #        proto: none

network/routes.sls

@@ -16,6 +16,8 @@ routes_{{ v.name|default(k) }}:
       - name: {{ net.name }}
         ipaddr: {{ net.ipaddr }}
         netmask: {{ net.netmask }}
+        {% if net.gateway is defined %}
         gateway: {{ net.gateway }}
+        {% endif %}
   {% endfor %}
 {% endfor %}

pillar.example.sls

@@ -1,9 +1,14 @@
+{# Disable default entries #}
 network:
-  interfaces:
-    {# Disable default interface entries #}
+  lookup:
     interfaces:
       def_entries: []
+    hosts:
+      def_entries: []
 
+########################
+network:
+  interfaces:
     {# Basic Setup #}
     - name: eth0
       proto: dhcp