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

Revert "Fix ipset:type colon handling error"
2018-05-13 22:15:20 +02:00 · 2018-05-13 22:15:20 +02:00 · 31ad6eb4c2
commit 31ad6eb4c2
parent 0a1f82dbf6 c7f4b3a611
2 changed files with 4 additions and 3 deletions
--- a/README.rst
+++ b/README.rst
@ -58,8 +58,8 @@ Salt Compatibility

 Tested with:

-* 2017.7.x
-* 2018.3.x
+* 2014.1.x
+* 2015.5.x

 OS Compatibility
 ================
--- a/firewalld/ipsets.sls
+++ b/firewalld/ipsets.sls
@ -45,7 +45,8 @@ directory_firewalld_ipsets:
    - watch_in:
      - cmd: reload_firewalld # reload firewalld config
    - context:
-        ipset: {{ v|json_encode_dict }}
+        name: {{ z_name }}
+        ipset: {{ v }}

 {% endfor %}
 {%- endif %}