Merge pull request #17 from saltstack-formulas/revert-16-master

Revert "Fix ipset:type colon handling error"
This commit is contained in:
Niels Abspoel 2018-05-13 22:15:20 +02:00 committed by GitHub
commit 31ad6eb4c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions

View File

@ -58,8 +58,8 @@ Salt Compatibility
Tested with: Tested with:
* 2017.7.x * 2014.1.x
* 2018.3.x * 2015.5.x
OS Compatibility OS Compatibility
================ ================

View File

@ -45,7 +45,8 @@ directory_firewalld_ipsets:
- watch_in: - watch_in:
- cmd: reload_firewalld # reload firewalld config - cmd: reload_firewalld # reload firewalld config
- context: - context:
ipset: {{ v|json_encode_dict }} name: {{ z_name }}
ipset: {{ v }}
{% endfor %} {% endfor %}
{%- endif %} {%- endif %}