浏览代码

Merge pull request #155 from Oro/patch-1

salt.api state fails
tags/v0.57.0
puneet kandhari 9 年前
父节点
当前提交
af8c157e2b
共有 1 个文件被更改,包括 6 次插入6 次删除
  1. +6
    -6
      salt/api.sls

+ 6
- 6
salt/api.sls 查看文件

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

正在加载...
取消
保存