Salt
/
salt-formula
mirror of https://github.com/saltstack-formulas/salt-formula.git
0
0
Fork 0
Code Issues Activity

fix(map.jinja): fix `salt-lint` errors 

```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 ##}
```
This commit is contained in:
Imran Iqbal 2019-10-09 18:32:11 +01:00
parent 33b133c200
commit 5b348eb354
No known key found for this signature in database
GPG Key ID: 6D8629439D2B7819
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/map.jinja
View File

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: ft=jinja # vim: ft=jinja
{## Start imports ##} {#- Start imports #}
{% import_yaml "salt/defaults.yaml" as defaults %} {% import_yaml "salt/defaults.yaml" as defaults %}
{% import_yaml "salt/osfamilymap.yaml" as osfamilymap %} {% import_yaml "salt/osfamilymap.yaml" as osfamilymap %}
{% import_yaml "salt/osmap.yaml" as osmap %} {% import_yaml "salt/osmap.yaml" as osmap %}
@ -18,8 +18,8 @@
{% set lookup = salt['pillar.get']('salt:lookup', default={}, merge=True) %} {% set lookup = salt['pillar.get']('salt:lookup', default={}, merge=True) %}
{% do salt['defaults.merge'](defaults['salt'], lookup) %} {% 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) %} {% 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) %} {% set formulas_settings = salt['pillar.get']('salt_formulas',default=defaults['salt_formulas'], merge=True) %}