From c1fc63d39a5a44732656bc2957ca519434feb040 Mon Sep 17 00:00:00 2001 From: jeanluc Date: Mon, 5 Dec 2022 18:13:08 +0100 Subject: [PATCH] Update docs --- conf/minion | 3 ++- doc/ref/configuration/minion.rst | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/conf/minion b/conf/minion index e4845cb8d27..eeef626fa83 100644 --- a/conf/minion +++ b/conf/minion @@ -171,7 +171,8 @@ # asynchronously, however, it still adds 5 seconds every time grains are # generated if an IP does not resolve. In Windows grains are regenerated each # time a new process is spawned. Therefore, the default for Windows is `False`. -# All other OSes default to `True` +# On macOS, FQDN resolution can be very slow, therefore the default for macOS is +# `False` as well. All other OSes default to `True` # enable_fqdns_grains: True # The minion can take a while to start up when lspci and/or dmidecode is used diff --git a/doc/ref/configuration/minion.rst b/doc/ref/configuration/minion.rst index 5d96171b309..57af5ce4a3a 100644 --- a/doc/ref/configuration/minion.rst +++ b/doc/ref/configuration/minion.rst @@ -1109,8 +1109,9 @@ adds 5 seconds every time grains are generated if an IP does not resolve. In Win grains are regenerated each time a new process is spawned. Therefore, the default for Windows is ``False``. In many cases this value does not make sense to include for proxy minions as it will be FQDN for the host running the proxy minion process, so the default -for proxy minions is ``False```. All other OSes default to ``True``. This options was -added `here `_. +for proxy minions is ``False```. On macOS, FQDN resolution can be very slow, therefore +the default for macOS is ``False`` as well. All other OSes default to ``True``. +This option was added `here `_. .. code-block:: yaml