diff --git a/salt/api.sls b/salt/api.sls index 4681c43..5f2eca1 100644 --- a/salt/api.sls +++ b/salt/api.sls @@ -6,7 +6,11 @@ include: salt-api: {% if salt_settings.install_packages %} pkg.installed: - - name: {{ salt_settings.salt_api }} + - pkgs: + - {{ salt_settings.salt_api }} +{% if salt['pillar.get']('salt:master:rest_tornado', {}) %} + - {{ salt_settings.python_tornado }} +{% endif %} {% endif %} service.running: - enable: True diff --git a/salt/defaults.yaml b/salt/defaults.yaml index 1a7fa7a..4e55156 100644 --- a/salt/defaults.yaml +++ b/salt/defaults.yaml @@ -17,6 +17,7 @@ salt: salt_cloud: salt-cloud salt_api: salt-api salt_ssh: salt-ssh + python_tornado: python-tornado python_git: python-git