Commit Graph

32 Commits

Author SHA1 Message Date
Denys Havrysh
3751a270d7 Document pillar cache options (#32643)
* Add note about Pillar data cache requirement for Pillar targeting method

* Add `saltutil.refresh_pillar` function to the scheduled Minion jobs

* Minor fixes in docs

* Add note about relations between `pillar_cache` option and Pillar Targeting
to Master config comments with small reformatting

* Document Pillar Cache Options for Salt Master

* Document Minions Targeting with Mine

* Remove `saltutil.refresh_pillar` scheduled persistent job
2016-04-22 08:54:30 -06:00
Denys Havrysh
aebc48163d Remove trailing white spaces in documentation files 2016-03-01 17:36:23 +02:00
Colton Myers
35425b14ad Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/man/salt-api.1
    doc/man/salt-call.1
    doc/man/salt-cloud.1
    doc/man/salt-cp.1
    doc/man/salt-key.1
    doc/man/salt-master.1
    doc/man/salt-minion.1
    doc/man/salt-run.1
    doc/man/salt-ssh.1
    doc/man/salt-syndic.1
    doc/man/salt-unity.1
    doc/man/salt.1
    doc/man/salt.7
    salt/modules/pip.py
    salt/states/user.py
2015-10-07 12:06:12 -06:00
Justin Findlay
3727d79bad edit mine doc for style and markup 2015-09-30 11:40:22 -06:00
Justin Findlay
7e037a4666 add doc motivating mine vs grains
Fixes #27518.
2015-09-30 11:40:22 -06:00
Colton Myers
95e70f0bef Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    salt/config.py
    salt/minion.py
    salt/modules/yumpkg.py
    salt/runners/ssh.py
    salt/states/git.py
    salt/states/http.py
2015-09-22 15:20:17 -06:00
Colton Myers
7b75e4aed1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-09-22 15:07:45 -06:00
Justin Findlay
3d28307a00 2014.7 -> 2014.7.0 2015-09-18 16:08:47 -06:00
Colton Myers
725e5c689f Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-06-11 13:15:38 -06:00
Colton Myers
f96c5029bb Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-06-11 13:14:37 -06:00
Bret Fisher
65a11336dc Fixed Mine example for jinja code block
In the Mine example, it has the `mine_functions:` deployed via a pillar file, but in the examples `/srv/salt/haproxy_config` snipit for the jinja code block, it used `expr_form='grain'` to access that mine function, which I couldn't get to work, until I changed it to `expr_form='pillar'`. Hopefully this is the right fix.
2015-06-11 00:50:34 -04:00
Colton Myers
ece63c36a3 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    doc/topics/ssh/roster.rst
    salt/modules/win_groupadd.py
2015-05-06 15:49:50 -06:00
Erik Johnson
0504e7a184 Update Lithium docstrings in 2015.2 branch 2015-05-06 11:01:53 -06:00
twellspring
6461b37e0f Clarify Mine Functions Aliases documentation
Clarify how to specify positional parameters.
2015-03-10 11:12:17 -07:00
rallytime
414990fc03 2015.2 --> 2015.2.0 2015-03-05 15:02:01 -07:00
Colton Myers
cc74c400b9 Add docs for mine in salt-ssh 2014-12-23 12:14:31 -07:00
Colton Myers
fc16bd16c0 Merge branch '2014.7' into merge-forward
Conflicts:
	doc/faq.rst
	doc/ref/states/compiler_ordering.rst
	doc/topics/best_practices.rst
	doc/topics/development/conventions/formulas.rst
	salt/config.py
	salt/modules/state.py
	salt/states/mount.py
	salt/utils/event.py
	tests/unit/utils/process_test.py
2014-12-16 14:45:25 -07:00
Seth House
51fa87c446 Change all state examples to use short-dec format for consistency
Closes #12419.

The command used to search the docs for state examples is below. This
generates a file in Vim's quickfix format that can be loaded with the -q
flag.

find . -type f \( -name '*.rst' -o -name '*.py' \) -print0
    | xargs -0 -P10 -n1 awk '
        BEGIN { RS=""; FS="\n" }
        { linenr = linect; linect += (NF + 1) }
        /^\s+[a-zA-Z0-9'\''_-]+:\n\s+[a-zA-Z0-9'\''_-]+:\n\s+- / {
            print FILENAME "|" linenr + 2 "|", $1
        }
    ' > ./salt-states.quickfix
2014-12-12 23:36:40 -07:00
Thomas Jackson
498a612078 Whitespace cleanup
Conflicts:
	doc/topics/cloud/linode.rst
	doc/topics/cloud/misc.rst
	doc/topics/cloud/parallels.rst
	doc/topics/cloud/proxmox.rst

Conflicts:
	doc/topics/development/architecture.rst
	doc/topics/development/translating.rst
2014-12-11 07:53:19 -08:00
Elias Probst
5580c714a5 Fix YAML syntax in mine_functions example.
The elements provided for a mine_functions definition need to be
either a list or a dict, but not a mix of both.
2014-11-14 21:25:30 +01:00
Seth House
05022c6adb Documented the mine_function alises
Closes #14738
2014-08-09 11:14:25 -06:00
Ahmad Sherif
0d94f4326d Move mine_interval example to a minion conf file
mine_interval has no effect when added in a pillar
2014-05-17 01:22:38 +03:00
Seth House
4f99597ce7 Comit 30,000. Woo! 2014-05-01 12:48:30 -06:00
Thomas S Hatch
6a9658bb98 Merge pull request #12423 from whiteinge/doc-mine-args
Clarified Salt Mine docs on how to pass arguments
2014-04-30 13:08:33 -06:00
Seth House
fe3d6d4630 Clarified Salt Mine docs on how to pass arguments 2014-04-30 13:04:59 -06:00
Joseph Hall
253a44f51c Merge pull request #12414 from whiteinge/doc-salt-mine-ex
Add example to Salt Mine docs
2014-04-30 10:06:18 -06:00
Seth House
9dcc8a3eda Removed version added from Salt Mine docs; other clean up 2014-04-30 09:58:38 -06:00
Seth House
6ce4b953eb Added a full example to the Salt Mine docs 2014-04-30 09:58:30 -06:00
Seth House
8022565be4 Added index entries for Salt Mine 2014-04-29 21:43:13 -06:00
Seth House
509d007da3 Added Mine example with arguments
Closes #11227
2014-04-17 17:58:34 -06:00
Seth House
32425e7148 Added rST anchor to Salt Mine docs 2013-11-20 20:23:31 -08:00
Thomas S Hatch
3d92e9544e Add docs for the salt mine 2013-04-22 00:07:23 -06:00