Merge pull request #253 from jerrykan/cloud_without_pip

By default don't install cloud dependencies using pip

salt/cloud.sls

@@ -4,6 +4,7 @@
 {% set cloudprofiles = salt['pillar.get']('salt:cloud:profiles', {}) -%}
 {% set cloudproviders = salt['pillar.get']('salt:cloud:providers', {}) -%}
 
+{%- if salt_settings.use_pip %}
 python-pip:
   pkg.installed
 
@@ -23,17 +24,20 @@ apache-libcloud:
   pip.installed:
     - require:
       - pkg: python-pip
+{%- endif %}
 
 {% if salt_settings.install_packages %}
 salt-cloud:
   pkg.installed:
     - 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 %}
+    {%- endif %}
 {% endif %}
 
 {% for cert in pillar.get('salt_cloud_certs', {}) %}

salt/defaults.yaml

@@ -2,6 +2,7 @@
 # vim: ft=yaml
 salt:
   install_packages: True
+  use_pip: False
   clean_config_d_dir: True
 
   config_path: /etc/salt