From de4e1915fb17b2278132076c7946539191f1e018 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 9 Nov 2019 07:05:11 +0000 Subject: [PATCH] fix(map.jinja): fix `salt-lint` errors ```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 ##} ``` --- firewalld/map.jinja | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/firewalld/map.jinja b/firewalld/map.jinja index e510183..8a8a394 100644 --- a/firewalld/map.jinja +++ b/firewalld/map.jinja @@ -1,25 +1,25 @@ # -*- coding: utf-8 -*- # vim: ft=jinja -{## Start with defaults from defaults.yaml ##} +{#- Start with defaults from defaults.yaml #} {% import_yaml "firewalld/defaults.yaml" as default_settings %} -{## +{#- Setup variable using grains['os_family'] based logic, only add key:values here that differ from whats in defaults.yaml -##} +#} {% set os_family_map = salt['grains.filter_by']({ 'Debian': {}, 'RedHat': {}, 'Arch': {}, 'Suse': {}, - }, 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) %} -{## Merge in salt:lookup pillar ##} +{#- Merge in salt:lookup pillar #} {% set firewalld = salt['pillar.get']( 'firewalld', default=default_settings.firewalld,