diff --git a/salt/api.sls b/salt/api.sls index 3314a26..a017e3c 100644 --- a/salt/api.sls +++ b/salt/api.sls @@ -38,11 +38,9 @@ salt_api_install: {%- if use_pip %} {%- if 'rest_cherrypy' in cfg_master %} salt_api_cherrypy: - pkg: - - purged - - name: {{ salt_settings['python_cherrypy'] }} - pip: - - installed + pkg.purged + - name: {{ salt_settings.python_cherrypy }} + pip.installed - name: cherrypy - require: - pkg: salt_api_cherrypy @@ -51,11 +49,9 @@ salt_api_cherrypy: {%- if 'rest_tornado' in cfg_master %} salt_api_tornado: - pkg: - - purged - - name: {{ salt_settings['python_tornado'] }} - pip: - - installed + pkg.purged + - name: {{ salt_settings.python_tornado }} + pip.installed - name: tornado - require: - pkg: salt_api_tornado @@ -66,15 +62,13 @@ salt_api_tornado: {% if 'rest_cherrypy' in cfg_master %} salt_api_cherrypy: - pkg: - - installed - - name: {{ salt_settings['python_cherrypy'] }} + pkg.installed + - name: {{ salt_settings.python_cherrypy }} {% endif %} {% if 'rest_tornado' in cfg_master %} salt_api_tornado: - pkg: - - installed - - name: {{ salt_settings['python_tornado'] }} + pkg.installed + - name: {{ salt_settings.python_tornado }} {% endif %} {%- endif %}