valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replaces incorrect reference to master_alive_check with master_alive_interval in docs

Browse Source
This commit is contained in:
Jacob Hammons 2016-03-30 20:32:43 -06:00
parent 0f5e67de5d
commit ff8ca5ac2e
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/ref/configuration/minion.rst
View File

@ -107,6 +107,8 @@ to manage the minion's master setting from an execution module. By simply
changing the algorithm in the module to return a new master ip/fqdn, restart changing the algorithm in the module to return a new master ip/fqdn, restart
the minion and it will connect to the new master. the minion and it will connect to the new master.
.. conf_minion:: master_alive_interval
``master_alive_interval`` ``master_alive_interval``
------------------------- -------------------------
@ -118,6 +120,8 @@ Configures how often, in seconds, the minion will verify that the current
master is alive and responding. The minion will try to establish a connection master is alive and responding. The minion will try to establish a connection
to the next master in the list if it finds the existing one is dead. to the next master in the list if it finds the existing one is dead.
.. conf_minion:: master_shuffle
``master_shuffle`` ``master_shuffle``
------------------ ------------------
@ -133,8 +137,10 @@ Python's :func:`random.shuffle <python2:random.shuffle>` method.
master_shuffle: True master_shuffle: True
.. conf_minion:: random_master
``random_master`` ``random_master``
------------------ -----------------
Default: ``False`` Default: ``False``
@ -149,7 +155,7 @@ Python's :func:`random.randint <python2:random.randint>` method.
.. conf_minion:: retry_dns .. conf_minion:: retry_dns
``retry_dns`` ``retry_dns``
--------------- -------------
Default: ``30`` Default: ``30``

14
doc/topics/highavailability/index.rst
View File

@ -28,14 +28,14 @@ A tutorial on setting up multimaster with "hot" masters is here:
Multimaster with Failover Multimaster with Failover
========================= =========================
Changing the ``master_type`` parameter from ``str`` to ``failover`` will Changing the ``master_type`` parameter from ``str`` to ``failover`` will cause
cause minions to connect to the first responding master in the list of masters. minions to connect to the first responding master in the list of masters. Every
Every ``master_alive_check`` seconds the minions will check to make sure :conf_minion:`master_alive_interval` seconds the minions will check to make
the current master is still responding. If the master does not respond, sure the current master is still responding. If the master does not respond,
the minion will attempt to connect to the next master in the list. If the the minion will attempt to connect to the next master in the list. If the
minion runs out of masters, the list will be recycled in case dead masters minion runs out of masters, the list will be recycled in case dead masters have
have been restored. Note that ``master_alive_check`` must be present in the been restored. Note that :conf_minion:`master_alive_interval` must be present
minion configuration, or else the recurring job to check master status in the minion configuration, or else the recurring job to check master status
will not get scheduled. will not get scheduled.
Failover can be combined with PKI-style encrypted keys, but PKI is NOT Failover can be combined with PKI-style encrypted keys, but PKI is NOT