Add no_proxy option to cont/minion docs and Fluorine release notes

Also cleans up a couple of items based on the feedback in #43764
This commit is contained in:
rallytime 2018-06-13 15:49:00 -04:00
parent 5f7aae3eef
commit 0fcf4c54d1
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
3 changed files with 23 additions and 2 deletions

View file

@ -20,6 +20,9 @@
#proxy_port:
#proxy_username:
#proxy_password:
# List of hosts to bypass HTTP proxy. This key does nothing unless proxy_host etc is
# configured, it does not support any kind of wildcards.
#no_proxy: []
# If multiple masters are specified in the 'master' setting, the default behavior

View file

@ -1404,18 +1404,22 @@ The password used for HTTP proxy access.
proxy_password: obolus
.. conf_minion:: no_proxy
``no_proxy``
------------
.. versionadded:: 2018.3.0
.. versionadded:: Fluorine
Default: ``[]``
List of hosts to bypass HTTP proxy
.. note::
This key does nothing unless proxy_host etc is configured, it does not support any kind of wildcards.
This key does nothing unless proxy_host etc is configured, it does not
support any kind of wildcards.
.. code-block:: yaml
no_proxy: [ '127.0.0.1', 'foo.tld' ]

View file

@ -315,6 +315,20 @@ several new features:
In addition, it is no longer necessary to specify what the hash of the patched
file should be.
New no_proxy Minion Configuration
=================================
Pass a list of hosts using the ``no_proxy`` minion config option to bypass an HTTP
proxy.
.. note::
This key does nothing unless proxy_host is configured and it does not support
any kind of wildcards.
.. code-block:: yaml
no_proxy: [ '127.0.0.1', 'foo.tld' ]
Deprecations
============