Browse Source

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 ##}
```
tags/v0.59.4
Imran Iqbal 5 years ago
parent
commit
5b348eb354
No account linked to committer's email address
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      salt/map.jinja

+ 3
- 3
salt/map.jinja View File

# -*- 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 %}
{% 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) %}

Loading…
Cancel
Save