saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

References to documentation.

Browse source
This commit is contained in:
C. R. Oldham 2015-06-23 11:40:06 -06:00
parent f0c9204d8b
commit 90c73ff446
4 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/contents-2.rst
View file

@ -9,6 +9,7 @@ Salt Table of Contents
topics/jobs/index
topics/event/index
topics/topology/index
topics/highavailability/index
topics/windows/index
topics/cloud/index
topics/netapi/index

1
doc/contents.rst
View file

@ -21,6 +21,7 @@ Salt Table of Contents
topics/event/index
topics/beacons/index
topics/ext_processes/index
topics/highavailability/index
topics/topology/index
topics/transports/raet/index
topics/windows/index

35
doc/ref/configuration/minion.rst
View file

@ -82,10 +82,24 @@ The option can can also be set to a list of masters, enabling
.. versionadded:: 2014.7.0
Default: ``str``
Default: ``standard``
The type of the :conf_minion:`master` variable. Can be either ``func`` or
``failover``.
The type of the :conf_minion:`master` variable. Can be ``standard``, ``failover`` or
``func``.
.. code-block:: yaml
master_type: failover
If this option is set to ``failover``, :conf_minion:`master` must be a list of
master addresses. The minion will then try each master in the order specified
in the list until it successfully connects. :conf_minion:`master_alive_interval`
must also be set, this determines how often the minion will verify the presence
of the master.
.. code-block:: yaml
master_type: func
If the master needs to be dynamically assigned by executing a function instead
of reading in the static master value, set this to ``func``. This can be used
@ -93,19 +107,16 @@ 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
the minion and it will connect to the new master.
``master_alive_interval``
-------------------------
.. code-block:: yaml
master_type: func
master_alive_interval: 30
If this option is set to ``failover``, :conf_minion:`master` must be a list of
master addresses. The minion will then try each master in the order specified
in the list until it successfully connects.
.. code-block:: yaml
master_type: failover
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
to the next master in the list if it finds the existing one is dead.
``master_shuffle``
------------------

2
doc/topics/highavailability/index.rst
View file

@ -44,7 +44,7 @@ REQUIRED to use failover.
Multimaster with PKI and Failover is discussed in
:doc:`this tutorial </topics/tutorials/multimaster_pki>`
``master_type: failover`` can be combined with ``shuffle_masters: True``
``master_type: failover`` can be combined with ``master_shuffle: True``
to spread minion connections across all masters (one master per
minion, not each minion connecting to all masters). Adding Salt Syndics
into the mix makes it possible to create a load-balanced Salt infrastructure.