Skip to content

Commit

Permalink
fix(map.jinja): fix salt-lint errors
Browse files Browse the repository at this point in the history
```bash
Examining salt/map.jinja of type state
[209] Jinja comment should have spaces before and after: {# comment #}
salt/map.jinja:4
{## Start imports ##}

[209] Jinja comment should have spaces before and after: {# comment #}
salt/map.jinja:21
{## Merge in salt pillar ##}

[209] Jinja comment should have spaces before and after: {# comment #}
salt/map.jinja:24
{## Merge in salt_formulas pillar ##}
```
  • Loading branch information
myii committed Oct 9, 2019
1 parent 33b133c commit 5b348eb
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions salt/map.jinja
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# vim: ft=jinja

{## Start imports ##}
{#- Start imports #}
{% import_yaml "salt/defaults.yaml" as defaults %}
{% import_yaml "salt/osfamilymap.yaml" as osfamilymap %}
{% import_yaml "salt/osmap.yaml" as osmap %}
Expand All @@ -18,8 +18,8 @@
{% set lookup = salt['pillar.get']('salt:lookup', default={}, merge=True) %}
{% do salt['defaults.merge'](defaults['salt'], lookup) %}

{## Merge in salt pillar ##}
{#- Merge in salt pillar #}
{% set salt_settings = salt['pillar.get']('salt', default=defaults['salt'], merge=True) %}

{## Merge in salt_formulas pillar ##}
{#- Merge in salt_formulas pillar #}
{% set formulas_settings = salt['pillar.get']('salt_formulas',default=defaults['salt_formulas'], merge=True) %}

0 comments on commit 5b348eb

Please sign in to comment.