From 8a1b8dc9db3781b46db1000205802fc864ba75cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Jochum?= <rene@jochums.at>
Date: Mon, 13 Jul 2015 13:46:17 +0200
Subject: [PATCH] Fix salt/api.sls.
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 | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/salt/api.sls b/salt/api.sls
index 820c349..9c1fa13 100644
--- a/salt/api.sls
+++ b/salt/api.sls
@@ -9,40 +9,39 @@ include:
 {%- set cfg_salt = pillar.get('salt', {}) %}
 {%- set cfg_master = cfg_salt.get('master', {}) %}
 
-salt-api:
+salt_api_install:
   pkg.installed:
-    - name: {{ salt_settings['salt-api'] }}
+    - name: {{ salt_settings['salt_api'] }}
   service.running:
     - name: {{ salt_settings.get('api_service', 'salt-api') }}
     - require:
-      - service: {{ salt_settings.get('api_service', 'salt-api') }}
 {%- if 'rest_cherrypy' in cfg_master %}
-      - pip: salt-api-cherrypy
+      - pip: salt_api_cherrypy
 {% elif 'rest_tornado' in cfg_master %}
-      - pip: salt-api-tornado
+      - pip: salt_api_tornado
 {% endif %}
     - watch:
       - pkg: salt-master
       - file: salt-master
 
 {%- if 'rest_cherrypy' in cfg_master %}
-salt-api-cherrypy:
+salt_api_cherrypy:
   pkg.purged:
     - name: {{ salt_settings['python-cherrypy'] }}
   pip.installed:
     - name: cherrypy
     - require:
-      - pkg: salt-api-cherrypy
+      - pkg: salt_api_cherrypy
       - pkg: pip_extensions
 {% endif %}
 
 {%- if 'rest_tornado' in cfg_master %}
-salt-api-tornado:
+salt_api_tornado:
   pkg.purged:
     - name: {{ salt_settings['python-tornado'] }}
   pip.installed:
     - name: tornado
     - require:
-      - pkg: salt-api-tornado
+      - pkg: salt_api_tornado
       - pkg: pip_extensions
 {% endif %}