Merge pull request #54 from sbraverman/brave-1

Simplifies jinja logic and removes extra lines
2016-06-16 17:36:10 -07:00 · 2016-06-16 17:36:10 -07:00 · 1b7e1794ef
commit 1b7e1794ef
parent 4586aea25c aeb1844e2f
1 changed files with 3 additions and 4 deletions
--- a/haproxy/init.sls
+++ b/haproxy/init.sls
@ -3,11 +3,10 @@
 # Meta-state to fully setup haproxy on debian. (or any other distro that has haproxy in their repo)

 include:
-{% if salt['pillar.get']('haproxy:include') %}
-{% for item in salt['pillar.get']('haproxy:include') %}
+{%- set haproxy_items = salt['pillar.get']('haproxy:include', []) %}
+{%- for item in haproxy_items %}
  - {{ item }}
-{% endfor %}
-{% endif %}
+{%- endfor %}
  - haproxy.install
  - haproxy.service
  - haproxy.config