saltstack-formulas/firewalld-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
```bash
Examining firewalld/map.jinja of type state
[209] Jinja comment should have spaces before and after: {# comment #}
firewalld/map.jinja:4
{## Start with  defaults from defaults.yaml ##}

[209] Jinja comment should have spaces before and after: {# comment #}
firewalld/map.jinja:7
{##

[201] Trailing whitespace
firewalld/map.jinja:16
  }, grain='os_family', merge=salt['pillar.get']('firewalld:lookup'))

[209] Jinja comment should have spaces before and after: {# comment #}
firewalld/map.jinja:19
{## Merge the flavor_map to the default settings ##}

[209] Jinja comment should have spaces before and after: {# comment #}
firewalld/map.jinja:22
{## Merge in salt:lookup pillar ##}
```
This commit is contained in:
Imran Iqbal 2019-11-09 07:05:11 +00:00
parent c5f114d886
commit de4e1915fb
No known key found for this signature in database
GPG Key ID: 6D8629439D2B7819
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
firewalld/map.jinja
View File

@ -1,13 +1,13 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: ft=jinja # vim: ft=jinja
{## Start with defaults from defaults.yaml ##} {#- Start with defaults from defaults.yaml #}
{% import_yaml "firewalld/defaults.yaml" as default_settings %} {% import_yaml "firewalld/defaults.yaml" as default_settings %}
{## {#-
Setup variable using grains['os_family'] based logic, only add key:values here Setup variable using grains['os_family'] based logic, only add key:values here
that differ from whats in defaults.yaml that differ from whats in defaults.yaml
##} #}
{% set os_family_map = salt['grains.filter_by']({ {% set os_family_map = salt['grains.filter_by']({
'Debian': {}, 'Debian': {},
'RedHat': {}, 'RedHat': {},
@ -16,10 +16,10 @@ that differ from whats in defaults.yaml
}, grain='os_family', merge=salt['pillar.get']('firewalld:lookup')) }, grain='os_family', merge=salt['pillar.get']('firewalld:lookup'))
%} %}
{## Merge the flavor_map to the default settings ##} {#- Merge the flavor_map to the default settings #}
{% do default_settings.firewalld.update(os_family_map) %} {% do default_settings.firewalld.update(os_family_map) %}
{## Merge in salt:lookup pillar ##} {#- Merge in salt:lookup pillar #}
{% set firewalld = salt['pillar.get']( {% set firewalld = salt['pillar.get'](
'firewalld', 'firewalld',
default=default_settings.firewalld, default=default_settings.firewalld,