Skip to content

Commit

Permalink
Merge pull request #155 from Oro/patch-1
Browse files Browse the repository at this point in the history
salt.api state fails
  • Loading branch information
puneetk committed Jul 14, 2015
2 parents 96d820a + 22b8dde commit af8c157
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions salt/api.sls
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ salt_api_install:
{%- if use_pip %}
{%- if 'rest_cherrypy' in cfg_master %}
salt_api_cherrypy:
pkg.purged
pkg.purged:
- name: {{ salt_settings.python_cherrypy }}
pip.installed
pip.installed:
- name: cherrypy
- require:
- pkg: salt_api_cherrypy
Expand All @@ -49,9 +49,9 @@ salt_api_cherrypy:
{%- if 'rest_tornado' in cfg_master %}
salt_api_tornado:
pkg.purged
pkg.purged:
- name: {{ salt_settings.python_tornado }}
pip.installed
pip.installed:
- name: tornado
- require:
- pkg: salt_api_tornado
Expand All @@ -62,13 +62,13 @@ salt_api_tornado:
{% if 'rest_cherrypy' in cfg_master %}
salt_api_cherrypy:
pkg.installed
pkg.installed:
- name: {{ salt_settings.python_cherrypy }}
{% endif %}
{% if 'rest_tornado' in cfg_master %}
salt_api_tornado:
pkg.installed
pkg.installed:
- name: {{ salt_settings.python_tornado }}
{% endif %}
{%- endif %}

0 comments on commit af8c157

Please sign in to comment.