Browse Source

Unsafe grains call in iptables formula fix

state iptables.rules may fail if grains_yaml is None

Change-Id: Ibd59c33345f1af97267a7632d3e5b64d885c41e8
pull/16/merge
Dzmitry Stremkouski 6 years ago
parent
commit
c01bfc9661
1 changed files with 7 additions and 3 deletions
  1. +7
    -3
      iptables/rules.sls

+ 7
- 3
iptables/rules.sls View File

{%- macro load_grains_file() %}{% include grains_fragment_file %}{% endmacro %} {%- macro load_grains_file() %}{% include grains_fragment_file %}{% endmacro %}
{%- set grains_yaml = load_grains_file()|load_yaml %} {%- set grains_yaml = load_grains_file()|load_yaml %}


{%- for rule in grains_yaml.iptables.rules %}
{%- set rule_name = service_name+'_'+loop.index|string %}
{%- if grains_yaml is iterable %}
{%- if grains_yaml.get('iptables',{}).rules is defined %}
{%- for rule in grains_yaml.iptables.rules %}
{%- set rule_name = service_name+'_'+loop.index|string %}
{% include "iptables/_rule.sls" %} {% include "iptables/_rule.sls" %}
{%- endfor %}
{%- endfor %}
{%- endif %}
{%- endif %}


{%- endif %} {%- endif %}
{%- endif %} {%- endif %}

Loading…
Cancel
Save