From c5ae289fa1210551986fbc6d959c3127e00011be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Jochum?= <rene@jochums.at>
Date: Mon, 13 Jul 2015 22:31:32 +0200
Subject: [PATCH] Fix stuff suggested by @iggy.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: René Jochum <rene@jochums.at>
---
 salt/api.sls | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/salt/api.sls b/salt/api.sls
index 3314a26..a017e3c 100644
--- a/salt/api.sls
+++ b/salt/api.sls
@@ -38,11 +38,9 @@ salt_api_install:
 {%- if use_pip %}
 {%- if 'rest_cherrypy' in cfg_master %}
 salt_api_cherrypy:
-  pkg:
-    - purged
-    - name: {{ salt_settings['python_cherrypy'] }}
-  pip:
-    - installed
+  pkg.purged
+    - name: {{ salt_settings.python_cherrypy }}
+  pip.installed
     - name: cherrypy
     - require:
       - pkg: salt_api_cherrypy
@@ -51,11 +49,9 @@ salt_api_cherrypy:
 
 {%- if 'rest_tornado' in cfg_master %}
 salt_api_tornado:
-  pkg:
-    - purged
-    - name: {{ salt_settings['python_tornado'] }}
-  pip:
-    - installed
+  pkg.purged
+    - name: {{ salt_settings.python_tornado }}
+  pip.installed
     - name: tornado
     - require:
       - pkg: salt_api_tornado
@@ -66,15 +62,13 @@ salt_api_tornado:
 
 {% if 'rest_cherrypy' in cfg_master %}
 salt_api_cherrypy:
-  pkg:
-    - installed
-    - name: {{ salt_settings['python_cherrypy'] }}
+  pkg.installed
+    - name: {{ salt_settings.python_cherrypy }}
 {% endif %}
 
 {% if 'rest_tornado' in cfg_master %}
 salt_api_tornado:
-  pkg:
-    - installed
-    - name: {{ salt_settings['python_tornado'] }}
+  pkg.installed
+    - name: {{ salt_settings.python_tornado }}
 {% endif %}
 {%- endif %}