Browse Source

Revert "salt.api state fails"

This reverts commit 22b8dde1ff.
master
Brian Jackson 9 years ago
parent
commit
f9cb912a65
1 changed files with 6 additions and 6 deletions
  1. +6
    -6
      salt/api.sls

+ 6
- 6
salt/api.sls View File

{%- if use_pip %} {%- if use_pip %}
{%- 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


{%- 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


{% if 'rest_cherrypy' in cfg_master %} {% if 'rest_cherrypy' in cfg_master %}
salt_api_cherrypy: salt_api_cherrypy:
pkg.installed:
pkg.installed
- name: {{ salt_settings.python_cherrypy }} - name: {{ salt_settings.python_cherrypy }}
{% endif %} {% endif %}


{% if 'rest_tornado' in cfg_master %} {% if 'rest_tornado' in cfg_master %}
salt_api_tornado: salt_api_tornado:
pkg.installed:
pkg.installed
- name: {{ salt_settings.python_tornado }} - name: {{ salt_settings.python_tornado }}
{% endif %} {% endif %}
{%- endif %} {%- endif %}

Loading…
Cancel
Save