Merge pull request #114 from alxwr/master

myii · web-flow · commit c58fa7c26be1 · 2019-05-15T17:20:43.000+01:00
map.jinja: use tplroot
diff --git a/template/map.jinja b/template/map.jinja
@@ -10,15 +10,15 @@
 {%- import_yaml tplroot ~ "/osfingermap.yaml" as osfingermap %}
 
 {%- set defaults = salt['grains.filter_by'](default_settings,
-    default='template',
+    default=tplroot,
     merge=salt['grains.filter_by'](osfamilymap, grain='os_family',
       merge=salt['grains.filter_by'](osmap, grain='os',
         merge=salt['grains.filter_by'](osfingermap, grain='osfinger',
-          merge=salt['config.get']('template:lookup', default={})
+          merge=salt['config.get'](tplroot ~ ':lookup', default={})
         )
       )
     )
 ) %}
 
 {#- Merge the template config (e.g. from pillar) #}
-{%- set template = salt['config.get']('template', default=defaults) %}
+{%- set template = salt['config.get'](tplroot, default=defaults) %}

Original file line number	Diff line number	Diff line change
`@@ -10,15 +10,15 @@`
`10`	`10`	`{%- import_yaml tplroot ~ "/osfingermap.yaml" as osfingermap %}`
`11`	`11`
`12`	`12`	`{%- set defaults = salt['grains.filter_by'](default_settings,`
`13`		`- default='template',`
	`13`	`+ default=tplroot,`
`14`	`14`	`merge=salt['grains.filter_by'](osfamilymap, grain='os_family',`
`15`	`15`	`merge=salt['grains.filter_by'](osmap, grain='os',`
`16`	`16`	`merge=salt['grains.filter_by'](osfingermap, grain='osfinger',`
`17`		`- merge=salt['config.get']('template:lookup', default={})`
	`17`	`+ merge=salt['config.get'](tplroot ~ ':lookup', default={})`
`18`	`18`	`)`
`19`	`19`	`)`
`20`	`20`	`)`
`21`	`21`	`) %}`
`22`	`22`
`23`	`23`	`{#- Merge the template config (e.g. from pillar) #}`
`24`		`-{%- set template = salt['config.get']('template', default=defaults) %}`
	`24`	`+{%- set template = salt['config.get'](tplroot, default=defaults) %}`