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

Add environment to the configuration guide

Browse Source
This commit is contained in:
Thomas S Hatch 2012-02-09 11:57:37 -07:00
parent 483c33bc7c
commit 427666236d
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/ref/configuration/master.rst
View File

@ -206,7 +206,7 @@ root of the base environment
Default: None
The external_nodes option allows Salt to gather data that would normally be
placed in a top file from and external node conreoller. The external_nodes
placed in a top file from and external node controller. The external_nodes
option is the executable that will return the ENC data. Remember that Salt
will look for external nodes AND top files and combine the results if both
are enabled and available!

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

@ -310,6 +310,21 @@ enabled and can be disabled by changing this value to False
clean_dynamic_modules: True
.. conf_minion:: environment
``environment``
---------------
Default: ``None``
Normally the minion is not isolated to any single environment on the master
when running states, but the environment can be isolated on the minion side
by statically setting it. Remember that the recommended way to manage
environments is to isolate via the top file.
.. code-block:: yaml
environment: None
Security Settings
------------------