removing some default host entries

network/defaults.yaml

@@ -36,7 +36,6 @@ Debian:
   hosts:
     values:
       path: /etc/hosts
-      ensure: present
     def_entries:
       - name: localhost
         ip: 127.0.0.1
@@ -58,10 +57,6 @@ Debian:
         ip: ff02::2
       - name: ip6-allhosts
         ip: ff02::3
-      - name: {{ salt['grains.get']('fqdn') }}
-        ip: 127.0.1.1
-      - name: {{ salt['grains.get']('host') }}
-        ip: 127.0.1.1
 RedHat:
   interfaces:
     pkgs: []
@@ -101,7 +96,6 @@ RedHat:
   hosts:
     values:
       path: /etc/hosts
-      ensure: present
     def_entries:
       - name: localhost
         ip: 127.0.0.1
@@ -123,8 +117,4 @@ RedHat:
         ip: ff02::2
       - name: ip6-allhosts
         ip: ff02::3
-      - name: {{ salt['grains.get']('fqdn') }}
-        ip: 127.0.1.1
-      - name: {{ salt['grains.get']('host') }}
-        ip: 127.0.1.1
 {% endload %}

network/hosts.sls

@@ -1,16 +1,16 @@
 {% from "network/defaults.yaml" import rawmap with context %}
 {% set datamap = salt['grains.filter_by'](rawmap, merge=salt['pillar.get']('network:lookup')) %}
 
-{% set hosts = datamap['hosts']['def_entries'] %}
+{% set hosts = datamap.hosts.def_entries %}
 
 {% if salt['pillar.get']('network:hosts', False) %}
   {% set hosts = hosts + salt['pillar.get']('network:hosts') %}
 {% endif %}
 
 {% for h in hosts %}
-host-{{ h['name'] }}_{{ h['ip'] }}:
+host_{{ h.name }}_{{ h.ip }}:
   host:
-    - {{ h['ensure']|default(datamap['hosts']['values']['ensure']) }}
-    - ip: {{ h['ip'] }}
-    - name: {{ h['name'] }}
+    - {{ h.ensure|default('present') }}
+    - ip: {{ h.ip }}
+    - name: {{ h.name }}
 {% endfor %}