commit 2285120b7de3fec122b7efff7ec42a8dd9dcd257
author Filip Pytloun <filip.pytloun@tcpcloud.eu> Thu May 05 22:38:23 2016 +0200
committer Filip Pytloun <filip.pytloun@tcpcloud.eu> Thu May 05 22:38:23 2016 +0200
tree 9d953ba2eeeca909f9707385dadcf46d457bbad1
parent 608aed834c3da750f5b738f579a995173d0d3080
parent c4993698ee18489a39ecda0538ec305345955aa9

Merge branch 'hotfix/installation-source-pip' into 'master'

Fixed incorrect placement of if block

See merge request !6

salt/map.jinja

diff --git a/salt/map.jinja b/salt/map.jinja
index c1e8e1a..e0bfc10 100644
--- a/salt/map.jinja
+++ b/salt/map.jinja
@@ -8,10 +8,10 @@
   {%- elif pillar.salt.master.source.engine == 'pip' %}
   install_state: "pip: salt_master_packages"
   {%- endif %}
-  {%- endif %}
   {%- if pillar.salt.master.source.version is defined %}
   version: {{ pillar.salt.master.source.version }}
   {%- endif %}
+  {%- endif %}
   accept_policy: preseed
   bind: {}
   formula: {}
@@ -59,10 +59,10 @@
   {%- elif pillar.salt.minion.source.engine == 'pip' %}
   install_state: "pip: salt_minion_packages"
   {%- endif %}
-  {%- endif %}
   {%- if pillar.salt.minion.source.version is defined %}
   version: {{ pillar.salt.minion.source.version }}
   {%- endif %}
+  {%- endif %}
 {%- endload %}
 
 {%- load_yaml as minion_specific %}