ci(salt-lint): fix

saltstack-formulas · May 24, 2020 · 60e8d19 · 60e8d19
1 parent d921a49
commit 60e8d19
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/haproxy/templates/haproxy.jinja b/haproxy/templates/haproxy.jinja
@@ -25,7 +25,7 @@
 global
 {%- if salt['pillar.get']('haproxy:global:log', []) != [] %}
 {%- for log in salt['pillar.get']('haproxy:global:log') %}
-    log {{log}}
+    log {{ log }}
 {%- endfor %}
 {%- else %}
     log /dev/log    local0
@@ -46,7 +46,10 @@ global
     daemon
 {%- endif %}
 {%- if salt['pillar.get']('haproxy:global:stats:enable', 'no') == True %}
-    stats socket {{ salt['pillar.get']('haproxy:global:stats:socketpath', '/tmp/ha_stats.sock') }} mode {{ salt['pillar.get']('haproxy:global:stats:mode', '660') }} level {{ salt['pillar.get']('haproxy:global:stats:level', 'operator') }}{% if 'extra' in salt['pillar.get']('haproxy:global:stats', {}) %} {{ salt['pillar.get']('haproxy:global:stats:extra') }}{% endif %}
+  {%- set socketpath = salt['pillar.get']('haproxy:global:stats:socketpath', '/tmp/ha_stats.sock') %}
+  {%- set mode = salt['pillar.get']('haproxy:global:stats:mode', '660') %}
+  {%- set level = salt['pillar.get']('haproxy:global:stats:level', 'operator') %}
+    stats socket {{ socketpath }} mode {{ mode }} level {{ level }}{% if 'extra' in salt['pillar.get']('haproxy:global:stats', {}) %} {{ salt['pillar.get']('haproxy:global:stats:extra') }}{% endif %}
 {%- endif %}
 {%- if 'maxconn' in salt['pillar.get']('haproxy:global', {}) %}
     maxconn {{ salt['pillar.get']('haproxy:global:maxconn') }}
@@ -368,7 +371,8 @@ listen {{ listener.get('name', listener_name) }}
     {%- endif %}
     {%- if 'servers' in listener %}
       {%- for server_name, server in listener.servers|dictsort %}
-    server {{ server.get('name', server_name) }} {{ server.host }}{% if 'port' in server %}:{{ server.port }}{% endif %} {% if 'maxconn' in server %} maxconn {{ server.maxconn }}{% endif %} {{ server.get('check', '') }} {{ server.get('extra', '') }}
+        {%- set name = server.get('name', server_name) %}
+    server {{ name }} {{ server.host }}{% if 'port' in server %}:{{ server.port }}{% endif %} {% if 'maxconn' in server %} maxconn {{ server.maxconn }}{% endif %} {{ server.get('check', '') }} {{ server.get('extra', '') }}
       {%- endfor %}
     {%- endif %}
   {% endfor %}