Change routes syntax and logical

network/defaults.yaml

@@ -21,6 +21,10 @@ Debian:
       - pre_down_cmds
       - post_up_cmds
       - post_down_cmds
+      # bonding
+      - master
+      - mode
+      - slaves
       #TODO - broadcast
     def_entries:
       - name: lo
@@ -80,6 +84,10 @@ RedHat:
       - pre_down_cmds
       - post_up_cmds
       - post_down_cmds
+      # bonding
+      - master
+      - mode
+      - slaves
       #TODO - broadcast
     def_entries: []
 #      - name: lo

network/routes.sls

@@ -1,13 +1,16 @@
 #!jinja|yaml
 # vim: sts=2 ts=2 sw=2 et ai
+{% from "network/defaults.yaml" import rawmap with context %}
+{% set datamap = salt['grains.filter_by'](rawmap, merge=salt['pillar.get']('network')) %}
 
-#{% from "network/defaults.yaml" import rawmap with context %}
-{% set datamap = salt['pillar.get']('network') %}
-{% set routes = datamap.routes %}
+{%- macro set_p(paramname, dictvar) -%}
+  {%- if paramname in dictvar -%}
+        {{ paramname }}: {{ dictvar[paramname] }}
+  {%- endif -%}
+{%- endmacro -%}
 
-{% if salt['pillar.get']('network:routes', False) %}
 
-{% for r in routes %}
+{% for r in datamap.routes %}
 {{ r.name }}:
   network.routes:
     - name: {{ r.name }} 
@@ -19,5 +22,3 @@
         gateway: {{ n.gateway }} 
       {% endfor %}
 {% endfor %}
-
-{% endif %}