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

Match the master config template in the master config reference

Browse source
This commit is contained in:
Colton Myers 2015-05-04 15:05:21 -06:00
parent 87fc3161f9
commit cb69cd07de
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
doc/ref/configuration/master.rst
View file

@ -430,8 +430,8 @@ that connect to a master via localhost.
presence_events: False
Salt-SSH Settings
=================
Salt-SSH Configuration
======================
.. conf_master:: roster_file
@ -454,7 +454,8 @@ Pass in an alternative location for the salt-ssh roster file
Default: None
Pass in minion option overrides that will be inserted into the SHIM for
salt-ssh calls. The local minion config is not used for salt-ssh.
salt-ssh calls. The local minion config is not used for salt-ssh. Can be
overridden on a per-minion basis in the roster (``minion_opts``)
.. code-block:: yaml