Merge "Salt minion allow to specify HTTP backend"

.kitchen.yml

@@ -85,6 +85,7 @@ suites:
         minion_handler.sls: tests/pillar/minion_custom_handler.sls
         minion_local_pillar.sls: tests/pillar/minion_local_pillar.sls
         minion_local_reclass.sls: tests/pillar/minion_local_reclass.sls
+        minion_backend_urllib.sls: tests/pillar/minion_backend_urllib.sls
 
   - name: master-default
     provisioner:

README.rst

@@ -364,6 +364,17 @@ Salt minion behind HTTP proxy
           host: 127.0.0.1
           port: 3128
 
+Salt minion to specify non-default HTTP backend. The default tornado backend
+does not respect HTTP proxy settings set as environment variables. This is
+useful for cases where you need to set no_proxy lists.
+
+.. code-block:: yaml
+
+    salt:
+      minion:
+        backend: urllib2
+
+
 Salt minion with PKI certificate authority (CA)
 
 .. literalinclude:: tests/pillar/minion_pki_ca.sls

salt/files/minion.conf

@@ -70,6 +70,10 @@ proxy_host: {{ minion.proxy.host }}
 proxy_port: {{ minion.proxy.port }}
 {%- endif %}
 
+{%- if minion.backend is defined %}
+backend: {{ minion.backend }}
+{%- endif %}
+
 {%- if minion.sentry is defined %}
 sentry_handler:
 {% for server in minion.sentry.servers %}

tests/pillar/minion_backend_urllib.sls

@@ -0,0 +1,4 @@
+salt:
+  minion:
+    enabled: true
+    backend: urllib2