From e2682bf4410388b21837688acb4282e91e02f21f Mon Sep 17 00:00:00 2001 From: chris ruscio Date: Thu, 30 Nov 2017 13:56:10 -0500 Subject: [PATCH] Fix minion ping_interval documentation --- conf/minion | 4 ++-- doc/ref/configuration/minion.rst | 2 +- salt/config/__init__.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/minion b/conf/minion index 34a6abeda40..6d559bf5dac 100644 --- a/conf/minion +++ b/conf/minion @@ -235,13 +235,13 @@ # cause sub minion process to restart. #auth_safemode: False -# Ping Master to ensure connection is alive (seconds). +# Ping Master to ensure connection is alive (minutes). #ping_interval: 0 # To auto recover minions if master changes IP address (DDNS) # auth_tries: 10 # auth_safemode: False -# ping_interval: 90 +# ping_interval: 2 # # Minions won't know master is missing until a ping fails. After the ping fail, # the minion will attempt authentication and likely fails out and cause a restart. diff --git a/doc/ref/configuration/minion.rst b/doc/ref/configuration/minion.rst index b3077fe0a44..d0d9977c56b 100644 --- a/doc/ref/configuration/minion.rst +++ b/doc/ref/configuration/minion.rst @@ -883,7 +883,7 @@ restart. Default: ``0`` -Instructs the minion to ping its master(s) every n number of seconds. Used +Instructs the minion to ping its master(s) every n number of minutes. Used primarily as a mitigation technique against minion disconnects. .. code-block:: yaml diff --git a/salt/config/__init__.py b/salt/config/__init__.py index 39898a711d5..a2893548e3f 100644 --- a/salt/config/__init__.py +++ b/salt/config/__init__.py @@ -855,7 +855,7 @@ VALID_OPTS = { 'queue_dirs': list, - # Instructs the minion to ping its master(s) every n number of seconds. Used + # Instructs the minion to ping its master(s) every n number of minutes. Used # primarily as a mitigation technique against minion disconnects. 'ping_interval': int,