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

Merge pull request #152 from pcdummy/master

Browse Source 
Fix stuff suggested by @iggy.
This commit is contained in:
puneet kandhari 2015-07-13 13:34:56 -07:00
commit 96d820a5a0
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
salt/api.sls
View File

@ -38,11 +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: pkg.purged
- 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
@ -51,11 +49,9 @@ salt_api_cherrypy:
{%- if 'rest_tornado' in cfg_master %} {%- if 'rest_tornado' in cfg_master %}
salt_api_tornado: salt_api_tornado:
pkg: pkg.purged
- 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
@ -66,15 +62,13 @@ salt_api_tornado:
{% if 'rest_cherrypy' in cfg_master %} {% if 'rest_cherrypy' in cfg_master %}
salt_api_cherrypy: salt_api_cherrypy:
pkg: pkg.installed
- 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: pkg.installed
- installed - name: {{ salt_settings.python_tornado }}
- name: {{ salt_settings['python_tornado'] }}
{% endif %} {% endif %}
{%- endif %} {%- endif %}