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

Merge pull request #25644 from cachedout/issue_25413

Browse source 
pillar doc fix
This commit is contained in:
Mike Place 2015-07-22 16:57:23 -06:00
commit 00f4689fe3
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc/topics/pillar/index.rst
View file

@ -364,17 +364,17 @@ can be created like this:
Master Config In Pillar
=======================
For convenience the data stored in the master configuration file is made
For convenience the data stored in the master configuration file can be made
available in all minion's pillars. This makes global configuration of services
and systems very easy but may not be desired if sensitive data is stored in the
master configuration.
master configuration. This option is disabled by default.
To disable the master config from being added to the pillar set ``pillar_opts``
to ``False``:
To enable the master config from being added to the pillar set ``pillar_opts``
to ``True``:
.. code-block:: yaml
pillar_opts: False
pillar_opts: True
Master Provided Pillar Error