Salt/salt-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2024-11-28 00:48:02 +01:00
Code Issues Activity

Fix salt/api.sls.

Browse Source 
Signed-off-by: René Jochum <rene@jochums.at>
This commit is contained in:
René Jochum 2015-07-13 13:46:17 +02:00
parent 7bb82b0178
commit 8a1b8dc9db
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
salt/api.sls
View File

@ -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 %}