瀏覽代碼

Revert "salt.api state fails"

This reverts commit 22b8dde1ff.
tags/v0.57.0
Brian Jackson 9 年之前
父節點
當前提交
f9cb912a65
共有 1 個文件被更改,包括 6 次插入6 次删除
  1. +6
    -6
      salt/api.sls

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

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

Loading…
取消
儲存