style: improve empty lines management

Author: javierbertoli

.travis.yml

@@ -32,15 +32,15 @@ env:
     - INSTANCE: default-fedora-29-2019-2-py3
     # - INSTANCE: default-opensuse-leap-15-2019-2-py3
     # - INSTANCE: default-debian-9-2018-3-py2
-    # - INSTANCE: default-ubuntu-1604-2018-3-py2
+    - INSTANCE: default-ubuntu-1604-2018-3-py2
     # - INSTANCE: default-centos-7-2018-3-py2
     # - INSTANCE: default-fedora-29-2018-3-py2
     # TODO: Use this when fixed instead of `opensuse-leap-42`
     # Ref: https://github.com/netmanagers/salt-image-builder/issues/2
     # - INSTANCE: default-opensuse-leap-15-2018-3-py2
     # - INSTANCE: default-opensuse-leap-42-2018-3-py2
     # - INSTANCE: default-debian-8-2017-7-py2
-    - INSTANCE: tables-ubuntu-1604-2017-7-py2
+    # - INSTANCE: tables-ubuntu-1604-2017-7-py2
     # TODO: Enable after improving the formula to work with other than `systemd`
     # - INSTANCE: default-centos-6-2017-7-py2
     # - INSTANCE: default-fedora-28-2017-7-py2

iptables/tables.sls

@@ -1,43 +1,43 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
-{% from "iptables/map.jinja" import firewall with context %}
+{%- from "iptables/map.jinja" import firewall with context %}
 
-{% for t in ['filter','nat','mangle'] %}
-  {% for cn, cv in firewall.get(t)|dictsort %}
-    {% set pol = cv.policy | default('ACCEPT') %}
-    {% set rules = cv.rules | default({}) %}
+{%- for t in ['filter','nat','mangle'] %}
+  {%- for cn, cv in firewall.get(t)|dictsort %}
+    {%- set pol = cv.policy | default('ACCEPT') %}
+    {%- set rules = cv.rules | default({}) %}
 
 chain_present_{{ t }}_{{ cn }}:
   iptables.chain_present:
     - table: {{ t }}
     - name: {{ cn }}
 
-    {% for rn, rv in rules|dictsort %}
+    {%- for rn, rv in rules|dictsort %}
 rule_{{ t }}_{{ cn }}_{{ rn }}:
-      {% if rv['position'] is defined %}
+      {%- if rv['position'] is defined %}
   iptables.insert:
-      {% else %}
+      {%- else %}
   iptables.append:
-      {% endif %}
+      {%- endif %}
     - table: {{ t }}
     - chain: {{ cn }}
-        {% for k,v in rv|dictsort %}
+        {%- for k,v in rv|dictsort %}
     - {{ k }}: '{{ v }}'
-        {% endfor %}
+        {%- endfor %}
     - save: true
     - require:
       - iptables: chain_present_{{ t }}_{{ cn }}
-    {% endfor %}
+    {%- endfor %}
 
-    {% if cn in ['INPUT','OUTPUT','FORWARD','PREROUTING','POSTROUTING'] %}
+    {%- if cn in ['INPUT','OUTPUT','FORWARD','PREROUTING','POSTROUTING'] %}
     # Set policies
 policy_{{ t }}_{{ cn }}_{{ pol }}:
   iptables.set_policy:
     - table: {{ t }}
     - chain: {{ cn }}
     - policy: {{ pol }}
     - save: true
-    {% endif %}
-  {% endfor %}
-{% endfor %}
+    {%- endif %}
+  {%- endfor %}
+{%- endfor %}

kitchen.yml

@@ -27,6 +27,13 @@ platforms:
     driver:
       image: netmanagers/salt-2019.2-py3:opensuse-leap-15
       run_command: /usr/lib/systemd/systemd
+  - name: ubuntu-1604-2018-3-py2
+    driver:
+      image: netmanagers/salt-2018.3-py2:ubuntu-16.04
+  - name: opensuse-leap-42-2017-7-py2
+    driver:
+      image: netmanagers/salt-2017.7-py2:opensuse-leap-42
+      run_command: /usr/lib/systemd/systemd
 
 provisioner:
   name: salt_solo