0
0
mirror of https://github.com/saltstack-formulas/sysctl-formula.git synced 2025-02-26 07:58:40 +01:00

Merge pull request #19 from babilen/empty-pillar-lookup

Check for presence of 'lookup' key
This commit is contained in:
Niels Abspoel 2016-06-26 20:39:19 +02:00 committed by GitHub
commit 329323b1a3

View File

@ -23,8 +23,8 @@ sysctl-present-{{ param_name }}:
{% endfor %} {% endfor %}
{% else %} {% else %}
{## Support for legacy pillar structure ##} {## Support for legacy pillar structure ##}
{%- if sysctl_settings.lookup.params2 is defined -%} {%- if sysctl_settings.lookup is defined %}
{% if sysctl_settings.lookup.params2 is defined -%}
{%- for param_name, param in sysctl_settings.lookup.get('params2', {}).items() -%} {%- for param_name, param in sysctl_settings.lookup.get('params2', {}).items() -%}
{%- if param is mapping %} {%- if param is mapping %}
sysctl-present-{{ param_name }}: sysctl-present-{{ param_name }}:
@ -50,5 +50,6 @@ sysctl-present-{{ param.name }}:
{% endif -%} {% endif -%}
{% endif -%} {% endif -%}
{% endfor %} {% endfor %}
{% endif -%}
{%- endif -%} {%- endif -%}
{%- endif -%} {%- endif -%}