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

Revert "Fix stuff suggested by @iggy."

Browse Source 
This reverts commit c5ae289fa1.
This commit is contained in:
Brian Jackson 2015-07-20 17:05:56 -05:00
parent ed3ab22a13
commit 8448aa4021
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
salt/api.sls
View File

@ -38,9 +38,11 @@ salt_api_install:
{%- if use_pip %}
{%- if 'rest_cherrypy' in cfg_master %}
salt_api_cherrypy:
pkg.purged
- name: {{ salt_settings.python_cherrypy }}
pip.installed
pkg:
- purged
- name: {{ salt_settings['python_cherrypy'] }}
pip:
- installed
- name: cherrypy
- require:
- pkg: salt_api_cherrypy
@ -49,9 +51,11 @@ salt_api_cherrypy:
{%- if 'rest_tornado' in cfg_master %}
salt_api_tornado:
pkg.purged
- name: {{ salt_settings.python_tornado }}
pip.installed
pkg:
- purged
- name: {{ salt_settings['python_tornado'] }}
pip:
- installed
- name: tornado
- require:
- pkg: salt_api_tornado
@ -62,13 +66,15 @@ salt_api_tornado:
{% if 'rest_cherrypy' in cfg_master %}
salt_api_cherrypy:
pkg.installed
- name: {{ salt_settings.python_cherrypy }}
pkg:
- installed
- name: {{ salt_settings['python_cherrypy'] }}
{% endif %}
{% if 'rest_tornado' in cfg_master %}
salt_api_tornado:
pkg.installed
- name: {{ salt_settings.python_tornado }}
pkg:
- installed
- name: {{ salt_settings['python_tornado'] }}
{% endif %}
{%- endif %}