From b9c5e030bc5fe4f903f5fbd994966331523fc405 Mon Sep 17 00:00:00 2001 From: Alexander Weidinger Date: Wed, 15 May 2019 18:01:09 +0200 Subject: [PATCH] fix(`map.jinja`): use tplroot When updating a formula the following should be sufficient: ``` cp template-formula/template/map.jinja my-formula/my/map.jinja sed -i '/set template =/set my =/' my-formula/my/map.jinja ``` Based on the work of @myii! --- template/map.jinja | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/template/map.jinja b/template/map.jinja index 5aed3601..2593ce08 100644 --- 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) %}