Import YAML with context (#56)

* fix(yaml): Import YAML with context * fix(sls): Add missing endif
saltstack-formulas · Aug 12, 2021 · 7e56f69 · 7e56f69
1 parent 79081c9
commit 7e56f69
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/node/config/clean.sls b/node/config/clean.sls
@@ -24,3 +24,5 @@ node-config-clean-file-absent:
       - {{ node.environ_file }}
     - require:
       - sls: {{ sls_package_clean }}
+      
+{%- endif %}
diff --git a/node/map.jinja b/node/map.jinja
@@ -2,10 +2,10 @@
 # vim: ft=jinja
 
 {%- set tplroot = tpldir.split('/')[0] %}
-{%- import_yaml tplroot ~ "/defaults.yaml" as default_settings %}
-{%- import_yaml tplroot ~ "/osfamilymap.yaml" as osfamilymap %}
-{%- import_yaml tplroot ~ "/osmap.yaml" as osmap %}
-{%- import_yaml tplroot ~ "/osarchmap.yaml" as osarchmap %}
+{%- import_yaml tplroot ~ "/defaults.yaml" as default_settings with context %}
+{%- import_yaml tplroot ~ "/osfamilymap.yaml" as osfamilymap with context %}
+{%- import_yaml tplroot ~ "/osmap.yaml" as osmap with context %}
+{%- import_yaml tplroot ~ "/osarchmap.yaml" as osarchmap with context %}
 
 {%- set _config = salt['config.get'](tplroot, default={}) %}
 {%- set defaults = salt['grains.filter_by'](