Compact salt-cloud pip.installed instructions

This commit is contained in:
Gilles Dartiguelongue 2017-04-10 09:54:56 +02:00
parent 85597b3326
commit dce9bea40b
1 changed files with 8 additions and 18 deletions

View File

@ -8,20 +8,14 @@
python-pip:
pkg.installed
pycrypto:
pip.installed:
- require:
- pkg: python-pip
{% if grains['os_family'] not in ['Debian', 'RedHat'] %}
crypto:
pip.installed:
- require:
- pkg: python-pip
{% endif %}
apache-libcloud:
salt-cloud-pip-packages:
pip.installed:
- pkgs:
- apache-libcloud
{%- if grains['os_family'] not in ['Debian', 'RedHat'] %}
- crypto
{%- endif %}
- pycrypto
- require:
- pkg: python-pip
{%- endif %}
@ -32,11 +26,7 @@ salt-cloud:
- name: {{ salt_settings.salt_cloud }}
{%- if salt_settings.use_pip %}
- require:
- pip: apache-libcloud
- pip: pycrypto
{% if grains['os_family'] not in ['Debian', 'RedHat'] %}
- pip: crypto
{% endif %}
- pip: salt-cloud-pip-packages
{%- endif %}
{% endif %}