Clarify ipv6 option for minion and inteface for master, closes #39118 (#39131)

* Clarify ipv6 option for minion and inteface for master, closes #39118

* Add ipv6 reference
This commit is contained in:
Ivan Babrou 2017-02-02 07:35:00 -08:00 committed by Nicole Thomas
parent 646b9ea4e5
commit 6ffeda3ee5
2 changed files with 16 additions and 2 deletions

View file

@ -27,7 +27,7 @@ Primary Master Configuration
Default: ``0.0.0.0`` (all interfaces)
The local interface to bind to.
The local interface to bind to, must be an IP address.
.. code-block:: yaml

View file

@ -31,7 +31,8 @@ Minion Primary Configuration
Default: ``salt``
The hostname or ipv4 of the master.
The hostname or IP address of the master. See :conf_minion:`ipv6` for IPv6
connections to the master.
Default: ``salt``
@ -75,6 +76,19 @@ The option can can also be set to a list of masters, enabling
- address2
master_type: failover
.. conf_minion:: ipv6
``ipv6``
--------
Default: ``False``
Whether the master should be connected over IPv6.
.. code-block:: yaml
ipv6: True
.. conf_minion:: master_type
``master_type``