From 66c0699814d077aa83de5fa5059a02cff80a6824 Mon Sep 17 00:00:00 2001
From: Niels Abspoel <aboe76@gmail.com>
Date: Sat, 26 Jan 2019 11:10:44 +0100
Subject: [PATCH] fix small issues found by @myii

---
 salt/map.jinja  | 4 ++--
 salt/osmap.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/salt/map.jinja b/salt/map.jinja
index 04fcec3..6b9756a 100644
--- a/salt/map.jinja
+++ b/salt/map.jinja
@@ -11,11 +11,11 @@
 
 {# merge the osfamilymap #}
 {% set osfamily = salt['grains.filter_by'](osfamilymap, grain='os_family') or{} %}
-{% do defaults.salt.update(osfamily) %}
+{% do salt['defaults.merge'](defaults['salt'], osfamily) %}
 
 {# merge the osmap #}
 {% set osmap = salt['grains.filter_by'](osmap, grain='os') or{} %}
-{% do defaults.salt.update(osmap) %}
+{% do salt['defaults.merge'](defaults['salt'], osmap) %}
 
 {## Merge in salt pillar ##}
 {% set salt_settings = salt['pillar.get']('salt', default=defaults['salt'], merge=True) %}
diff --git a/salt/osmap.yaml b/salt/osmap.yaml
index 90e75b9..9b640db 100644
--- a/salt/osmap.yaml
+++ b/salt/osmap.yaml
@@ -22,7 +22,7 @@ Ubuntu:
       install_from_source: False
       git:
         require_state: False
-        install_from_package: None
+        install_from_package: Null
 
 Raspbian:
   pkgrepo: 'deb http://repo.saltstack.com/apt/{{ os_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }} {{ oscodename }} main'