commit 331f53265f2d901b4d1c09c9f8be500c6583f396
author Petr Michalec <pmichalec@mirantis.com> Thu May 17 13:14:37 2018 +0000
committer Gerrit Code Review <gerrit2@15508502dd39> Thu May 17 13:14:38 2018 +0000
tree dae8b6a098d81bb58bf6bca84c11b5f3def6ca65
parent ad8648f61f4c7717399eeffc8395d18449fc6a49
parent b20ab4e91266531bbe9a4765684d0363eb66591e

Merge "Add Salt 2018.3 tests"

iptables/_rule.sls

diff --git a/iptables/_rule.sls b/iptables/_rule.sls
index 3fea39c..3ae7c22 100644
--- a/iptables/_rule.sls
+++ b/iptables/_rule.sls
@@ -4,9 +4,13 @@
   - position: {{ rule.position }}
   {%- else %}
   iptables.append:
-  {%- if loop.index != 1 %}
   - require:
+  {%- if loop.index != 1 %}
     - iptables: iptables_{{ chain_name }}_{% if service_name is defined %}{{ service_name }}_{% endif %}{{ loop.index - 1 }}
+  {%- else %}
+  {%- for chain in chains %}
+    - iptables: iptables_{{ chain }}
+  {%- endfor %}
   {%- endif %}
   {%- endif %}
   - table: {{ rule.get('table', 'filter') }}

iptables/rules.sls

diff --git a/iptables/rules.sls b/iptables/rules.sls
index ec39e15..f3fb66f 100644
--- a/iptables/rules.sls
+++ b/iptables/rules.sls
@@ -1,6 +1,7 @@
 {% from "iptables/map.jinja" import service with context %}
 {%- if grains.get('virtual_subtype', None) not in ['Docker', 'LXC'] %}
 
+{%- set chains = service.get('chain', {}).keys() %}
 {%- for chain_name, chain in service.get('chain', {}).iteritems() %}
 
 iptables_{{ chain_name }}:

metadata.yml

diff --git a/metadata.yml b/metadata.yml
index 6b8418c..e8276c0 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,4 +1,4 @@
 name: "iptables"
 version: "0.2"
-source: "https://github.com/tcpcloud/salt-formula-iptables"
+source: "https://github.com/salt-formulas/salt-formula-iptables"