Browse Source

Fix salt/api.sls.

Signed-off-by: René Jochum <rene@jochums.at>
tags/v0.57.0
René Jochum 9 years ago
parent
commit
8a1b8dc9db
1 changed files with 8 additions and 9 deletions
  1. +8
    -9
      salt/api.sls

+ 8
- 9
salt/api.sls View File

{%- set cfg_salt = pillar.get('salt', {}) %} {%- set cfg_salt = pillar.get('salt', {}) %}
{%- set cfg_master = cfg_salt.get('master', {}) %} {%- set cfg_master = cfg_salt.get('master', {}) %}


salt-api:
salt_api_install:
pkg.installed: pkg.installed:
- name: {{ salt_settings['salt-api'] }}
- name: {{ salt_settings['salt_api'] }}
service.running: service.running:
- name: {{ salt_settings.get('api_service', 'salt-api') }} - name: {{ salt_settings.get('api_service', 'salt-api') }}
- require: - require:
- service: {{ salt_settings.get('api_service', 'salt-api') }}
{%- if 'rest_cherrypy' in cfg_master %} {%- if 'rest_cherrypy' in cfg_master %}
- pip: salt-api-cherrypy
- pip: salt_api_cherrypy
{% elif 'rest_tornado' in cfg_master %} {% elif 'rest_tornado' in cfg_master %}
- pip: salt-api-tornado
- pip: salt_api_tornado
{% endif %} {% endif %}
- watch: - watch:
- pkg: salt-master - pkg: salt-master
- file: salt-master - file: salt-master


{%- if 'rest_cherrypy' in cfg_master %} {%- if 'rest_cherrypy' in cfg_master %}
salt-api-cherrypy:
salt_api_cherrypy:
pkg.purged: pkg.purged:
- name: {{ salt_settings['python-cherrypy'] }} - name: {{ salt_settings['python-cherrypy'] }}
pip.installed: pip.installed:
- name: cherrypy - name: cherrypy
- require: - require:
- pkg: salt-api-cherrypy
- pkg: salt_api_cherrypy
- pkg: pip_extensions - pkg: pip_extensions
{% endif %} {% endif %}


{%- if 'rest_tornado' in cfg_master %} {%- if 'rest_tornado' in cfg_master %}
salt-api-tornado:
salt_api_tornado:
pkg.purged: pkg.purged:
- name: {{ salt_settings['python-tornado'] }} - name: {{ salt_settings['python-tornado'] }}
pip.installed: pip.installed:
- name: tornado - name: tornado
- require: - require:
- pkg: salt-api-tornado
- pkg: salt_api_tornado
- pkg: pip_extensions - pkg: pip_extensions
{% endif %} {% endif %}

Loading…
Cancel
Save