diff --git a/pillar.example b/pillar.example index 21b0061..a311ee7 100644 --- a/pillar.example +++ b/pillar.example @@ -11,3 +11,10 @@ sysctl: - name: vm.swappiness value: 20 + # Setting params2 excludes all params values + params2: + fs.file-max: + value: 100000 + config: fs.conf + vm.swappiness: + value: 20 \ No newline at end of file diff --git a/sysctl/param.sls b/sysctl/param.sls index ae1bb99..9e510d1 100644 --- a/sysctl/param.sls +++ b/sysctl/param.sls @@ -2,16 +2,34 @@ # vim: ft=sls {## import settings from map.jinja ##} -{% from "sysctl/map.jinja" import sysctl_settings with context %} +{%- from "sysctl/map.jinja" import sysctl_settings with context -%} -{% for param in sysctl_settings.get('params', {}) %} - {% if param is mapping %} +{%- if sysctl_settings.params2 is defined -%} + + {%- for param_name, param in sysctl_settings.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.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 %} -{% endfor %} + {% endif -%} + {% endif -%} + {% endfor %} + +{%- endif -%}