saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Revert "salt.api state fails"

Browse Source 
This reverts commit 22b8dde1ff21acf97cd30fe197d20d451246b5ae.
This commit is contained in:
Brian Jackson 2015-07-20 17:05:56 -05:00
parent ef73e4ce98
commit f9cb912a65
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/api.sls
View File

@ -38,9 +38,9 @@ salt_api_install:
{%- 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
@ -49,9 +49,9 @@ 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
@ -62,13 +62,13 @@ 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 %}