Salt/sysctl-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/sysctl-formula.git synced 2026-07-16 06:00:38 +02:00
Code Issues Activity

Switch to cleaner pillar structure

Browse Source 
This commit allows users to specify sysctl parameters in an easier
format than the one that was used before. It moves settings out of the
'lookup' pillar namespace in a backward compatible manner and is
modelled after the old 'params2' approach.

It also introduces a simplified scheme, in which parameters can be
specified as key-value pairs, which makes for cleaner pillars if there
is no need to specify a custom configuration file.
This commit is contained in:
Wolodja Wentland
2016-04-26 16:37:07 +02:00
parent 97e305dc97
commit cb2822f0f4
5 changed files with 91 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sysctl/param.sls
+32 -13
View File
@@ -4,32 +4,51 @@
{## import settings from map.jinja ##}
{%- from "sysctl/map.jinja" import sysctl_settings with context -%}
{%- if sysctl_settings.params2 is defined -%}
{%- for param_name, param in sysctl_settings.get('params2', {}).items() -%}
{%- if param is mapping %}
{% if sysctl_settings.params is defined %}
{% for param_name, param in sysctl_settings.get('params').items() %}
{% if param is mapping %}
sysctl-present-{{ param_name }}:
sysctl.present:
- name: {{ param_name }}
- value: {{ param.value }}
{%- if param.config is defined %}
{%- if param.config is defined %}
- config: {{ sysctl_settings.config.location }}/{{ param.config }}
{% endif -%}
{% endif -%}
{% endif -%}
{% else %}
sysctl-present-{{ param_name }}:
sysctl.present:
- name: {{ param_name }}
- value: {{ param }}
{% endif %}
{% endfor %}
{% else %}
{## Support for legacy pillar structure ##}
{%- if sysctl_settings.lookup.params2 is defined -%}
{%- for param in sysctl_settings.get('params', {}) -%}
{%- for param_name, param in sysctl_settings.lookup.get('params2', {}).items() -%}
{%- if param is mapping %}
sysctl-present-{{ param_name }}:
sysctl.present:
- name: {{ param_name }}
- value: {{ param.value }}
{%- if param.config is defined %}
- config: {{ sysctl_settings.config.location }}/{{ param.config }}
{% endif -%}
{% endif -%}
{% endfor %}
{% else %}
{%- for param in sysctl_settings.lookup.get('params', {}) -%}
{%- if param is mapping %}
sysctl-present-{{ param.name }}:
sysctl.present:
- name: {{ param.name }}
- value: {{ param.value }}
{%- if param.config is defined %}
{%- if param.config is defined %}
- config: {{ sysctl_settings.config.location }}/{{ param.config }}
{% endif -%}
{% endif -%}
{% endif -%}
{% endfor %}
{% endfor %}
{%- endif -%}
{%- endif -%}