From f9cb912a65ab2a252ee0a9c94e271b4633abcba2 Mon Sep 17 00:00:00 2001 From: Brian Jackson Date: Mon, 20 Jul 2015 17:05:56 -0500 Subject: [PATCH] Revert "salt.api state fails" This reverts commit 22b8dde1ff21acf97cd30fe197d20d451246b5ae. --- salt/api.sls | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/salt/api.sls b/salt/api.sls index d4f0df8..a017e3c 100644 --- a/salt/api.sls +++ b/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 %}