From f84a0c4a9fd89d0e852ce656b38814a08f0fa21b Mon Sep 17 00:00:00 2001 From: Nitin Madhok Date: Thu, 6 Nov 2014 13:33:53 -0500 Subject: [PATCH] Removing crypto pip dependency for Ubuntu and Debian Fixes: https://github.com/saltstack-formulas/salt-formula/issues/59 Refer to PR: https://github.com/saltstack-formulas/salt-formula/pull/60 --- salt/cloud.sls | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/salt/cloud.sls b/salt/cloud.sls index 25a2cfb..a6f9f67 100644 --- a/salt/cloud.sls +++ b/salt/cloud.sls @@ -10,10 +10,12 @@ pycrypto: - require: - pkg: python-pip +{% if grains['os'] not in ['Ubuntu', 'Debian'] %} crypto: pip.installed: - require: - pkg: python-pip +{% endif %} apache-libcloud: pip.installed: @@ -26,7 +28,9 @@ salt-cloud: - require: - pip: apache-libcloud - pip: pycrypto + {% if grains['os'] not in ['Ubuntu', 'Debian'] %} - pip: crypto + {% endif %} {% for folder in cloud['folders'] %} {{ folder }}: