Browse Source

Salt minion allow to specify HTTP backend

This is useful when using proxies. The default Tornado backend does not
utilize proxy environment variables and isn't able to set no_proxy variable.

Change-Id: I4a51c6fc9abe65d46ed4f3adeb30f7a25337857e
pull/56/head
Sam Stoelinga 7 years ago
parent
commit
bb4c04bbe4
4 changed files with 20 additions and 0 deletions
  1. +1
    -0
      .kitchen.yml
  2. +11
    -0
      README.rst
  3. +4
    -0
      salt/files/minion.conf
  4. +4
    -0
      tests/pillar/minion_backend_urllib.sls

+ 1
- 0
.kitchen.yml View File

minion_handler.sls: tests/pillar/minion_custom_handler.sls minion_handler.sls: tests/pillar/minion_custom_handler.sls
minion_local_pillar.sls: tests/pillar/minion_local_pillar.sls minion_local_pillar.sls: tests/pillar/minion_local_pillar.sls
minion_local_reclass.sls: tests/pillar/minion_local_reclass.sls minion_local_reclass.sls: tests/pillar/minion_local_reclass.sls
minion_backend_urllib.sls: tests/pillar/minion_backend_urllib.sls


- name: master-default - name: master-default
provisioner: provisioner:

+ 11
- 0
README.rst View File

host: 127.0.0.1 host: 127.0.0.1
port: 3128 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) Salt minion with PKI certificate authority (CA)


.. literalinclude:: tests/pillar/minion_pki_ca.sls .. literalinclude:: tests/pillar/minion_pki_ca.sls

+ 4
- 0
salt/files/minion.conf View File

proxy_port: {{ minion.proxy.port }} proxy_port: {{ minion.proxy.port }}
{%- endif %} {%- endif %}


{%- if minion.backend is defined %}
backend: {{ minion.backend }}
{%- endif %}

{%- if minion.sentry is defined %} {%- if minion.sentry is defined %}
sentry_handler: sentry_handler:
{% for server in minion.sentry.servers %} {% for server in minion.sentry.servers %}

+ 4
- 0
tests/pillar/minion_backend_urllib.sls View File

salt:
minion:
enabled: true
backend: urllib2

Loading…
Cancel
Save