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

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

```bash
Examining sysctl/map.jinja of type state
[209] Jinja comment should have spaces before and after: {# comment #}
sysctl/map.jinja:4
{## Start with  defaults from defaults.sls and osfamilymap.yml ##}

[209] Jinja comment should have spaces before and after: {# comment #}
sysctl/map.jinja:21
{## Apply backwards compatiblility after merge ##}

[209] Jinja comment should have spaces before and after: {# comment #}
sysctl/map.jinja:29
{## Merge in sysctl pillar ##}
```
This commit is contained in:
Imran Iqbal 2019-10-09 18:38:09 +01:00
parent 3f93becec0
commit 6a08317ae7
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
sysctl/map.jinja
View File

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: ft=jinja # vim: ft=jinja
{## Start with defaults from defaults.sls and osfamilymap.yml ##} {#- Start with defaults from defaults.sls and osfamilymap.yml #}
{% import_yaml 'sysctl/defaults.yml' as default_settings %} {% import_yaml 'sysctl/defaults.yml' as default_settings %}
{% import_yaml "sysctl/osfamilymap.yml" as os_family_map %} {% import_yaml "sysctl/osfamilymap.yml" as os_family_map %}
@ -18,7 +18,7 @@
) )
%} %}
{## Apply backwards compatiblility after merge ##} {#- Apply backwards compatiblility after merge #}
{% if default_settings['sysctl']['params'] is defined %} {% if default_settings['sysctl']['params'] is defined %}
{% do default_settings['sysctl'].pop('params') %} {% do default_settings['sysctl'].pop('params') %}
{% endif %} {% endif %}
@ -26,7 +26,7 @@
{% do default_settings['sysctl'].pop('params2') %} {% do default_settings['sysctl'].pop('params2') %}
{% endif %} {% endif %}
{## Merge in sysctl pillar ##} {#- Merge in sysctl pillar #}
{% set sysctl_settings = salt['pillar.get']( {% set sysctl_settings = salt['pillar.get'](
'sysctl', 'sysctl',
default=default_settings['sysctl'], default=default_settings['sysctl'],