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

Update note in topics/grains to reflect that not all grains are ignored.

Browse source 
only those set in the minion config

also update header of salt.modules.grains to more closely match what
states says in regard to this.

and tweak the note portion to stand out a bit more.

tweaked the state note to also stand out more
This commit is contained in:
Thomas Phipps 2017-11-22 15:17:45 -08:00
parent d6ccf4bb30
commit 7fb208b5ad
No known key found for this signature in database
GPG key ID: 614749FA9D06F57A
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -80,7 +80,7 @@ same way as in the above example, only without a top-level ``grains:`` key:
.. note::
The content of ``/etc/salt/grains`` is ignored if you specify grains in the minion config.
Grains in ``/etc/salt/grains`` are ignored if you specify the same grains in the minion config.
.. note::

7
salt/modules/grains.py
View file

@ -1,6 +1,13 @@
# -*- coding: utf-8 -*-
'''
Return/control aspects of the grains data
Grains set or altered this way are stored in the 'grains'
file on the minions, by default at: ``/etc/salt/grains``
.. Note::
This does **NOT** override any grains set in the minion file.
'''
# Import python libs

6
salt/states/grains.py
View file

@ -5,9 +5,11 @@ Manage grains on the minion
This state allows for grains to be set.
Grains set or altered this way are stored in the 'grains'
file on the minions, by default at: /etc/salt/grains
file on the minions, by default at: ``/etc/salt/grains``
Note: This does NOT override any grains set in the minion file.
.. Note::
This does **NOT** override any grains set in the minion file.
'''
# Import Python libs