Merge pull request #30 from netmanagers/master

Add osfingermap.yml
saltstack-formulas · Sep 11, 2018 · 095db72 · 095db72
2 parents 7929554 + 4e2907b
commit 095db72
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/nfs/map.jinja b/nfs/map.jinja
@@ -5,6 +5,7 @@
 {% import_yaml 'nfs/defaults.yaml' as defaults %}
 {% import_yaml 'nfs/osfamilymap.yaml' as osfamilymap %}
 {% import_yaml 'nfs/osmap.yaml' as osmap %}
+{% import_yaml 'nfs/osfingermap.yaml' as osfingermap %}
 
 {% set nfs = salt['grains.filter_by'](
     defaults,
@@ -14,7 +15,10 @@
         merge = salt['grains.filter_by'](
             osmap,
             grain='os',
-            merge = salt['pillar.get']('nfs', {}),
+            merge = salt['grains.filter_by'](
+                osfingermap,
+                merge = salt['pillar.get']('nfs', {}),
+            ),
         ),
     ),
     base='nfs')

diff --git a/nfs/osfingermap.yaml b/nfs/osfingermap.yaml
@@ -0,0 +1,2 @@
+Debian-8:
+  service_name: 'nfs-kernel-server'