Skip to content

Commit 7e56f69

Browse files
authored
Import YAML with context (#56)
* fix(yaml): Import YAML with context * fix(sls): Add missing endif
1 parent 79081c9 commit 7e56f69

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

node/config/clean.sls

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@ node-config-clean-file-absent:
2424
- {{ node.environ_file }}
2525
- require:
2626
- sls: {{ sls_package_clean }}
27+
28+
{%- endif %}

node/map.jinja

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# vim: ft=jinja
33

44
{%- set tplroot = tpldir.split('/')[0] %}
5-
{%- import_yaml tplroot ~ "/defaults.yaml" as default_settings %}
6-
{%- import_yaml tplroot ~ "/osfamilymap.yaml" as osfamilymap %}
7-
{%- import_yaml tplroot ~ "/osmap.yaml" as osmap %}
8-
{%- import_yaml tplroot ~ "/osarchmap.yaml" as osarchmap %}
5+
{%- import_yaml tplroot ~ "/defaults.yaml" as default_settings with context %}
6+
{%- import_yaml tplroot ~ "/osfamilymap.yaml" as osfamilymap with context %}
7+
{%- import_yaml tplroot ~ "/osmap.yaml" as osmap with context %}
8+
{%- import_yaml tplroot ~ "/osarchmap.yaml" as osarchmap with context %}
99

1010
{%- set _config = salt['config.get'](tplroot, default={}) %}
1111
{%- set defaults = salt['grains.filter_by'](

0 commit comments

Comments
 (0)