Document minion_id_caching config value (#33282)

Fixes #33276
This commit is contained in:
Nicole Thomas 2016-05-16 14:12:38 -06:00 committed by Mike Place
parent 8fa72f6588
commit 061851bcbf
2 changed files with 31 additions and 0 deletions

View file

@ -77,6 +77,13 @@
# clusters.
#id:
# Cache the minion id to a file when the minion's id is not statically defined
# in the minion config. Defaults to "True". This setting prevents potential
# problems when automatic minion id resolution changes, which can cause the
# minion to loose connection with the master. To turn off minion id caching,
# set this config to ``False``.
#minion_id_caching: True
# Append a domain to a hostname in the event that it does not exist. This is
# useful for systems where socket.getfqdn() does not actually result in a
# FQDN (for instance, Solaris).

View file

@ -267,6 +267,30 @@ ids.
id: foo.bar.com
.. conf_minion:: minion_id_caching
``minion_id_caching``
---------------------
.. versionadded:: 0.17.2
Default: ``True``
Caches the minion id to a file when the minion's :minion_conf:`id` is not
statically defined in the minion config. This setting prevents potential
problems when automatic minion id resolution changes, which can cause the
minion to loose connection with the master. To turn off minion id caching,
set this config to ``False``.
For more information, please see `Issue #7558`_ and `Pull Request #8488`_.
.. code-block:: yaml
minion_id_caching: True
.. _Issue #7558: https://github.com/saltstack/salt/issues/7558
.. _Pull Request #8488: https://github.com/saltstack/salt/pull/8488
.. conf_minion:: append_domain
``append_domain``