Skip to content

Commit cf36b81

Browse files
terminalmagedwoz
authored andcommitted
Update state_top_saltenv docs for cases where minion has explicit saltenv
In those cases, the explicit saltenv overrides this master config option.
1 parent e48e811 commit cf36b81

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

doc/ref/configuration/master.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2485,7 +2485,11 @@ This option has no default value. Set it to an environment name to ensure that
24852485
:ref:`highstate <running-highstate>`.
24862486

24872487
.. note::
2488-
Using this value does not change the merging strategy. For instance, if
2488+
Minions which have an explicit :conf_minion:`saltenv` set will use that
2489+
environment's top file, ignoring this master config option.
2490+
2491+
.. note::
2492+
Using this option does not change the merging strategy. For instance, if
24892493
:conf_master:`top_file_merging_strategy` is set to ``merge``, and
24902494
:conf_master:`state_top_saltenv` is set to ``foo``, then any sections for
24912495
environments other than ``foo`` in the top file for the ``foo`` environment

0 commit comments

Comments
 (0)