valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
49,219 Commits 24 Branches 182 Tags 341 MiB
fe829564f4
Commit Graph

64 Commits

Author SHA1 Message Date
Mike Place
8cef61e6cc pillar doc fix 
closes #25413
 2015-07-22 16:56:53 -06:00
s8weber
ad869c74b1 add pillar_safe_render_error config 
allow a salt admin to config if the detailed render error of pillars
can be passed to the minion.
 2015-03-04 10:22:29 -05: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
Steve Weber
88f28b90fb doc fix 
doc fix
 2014-09-26 09:28:16 -04:00
Thomas Martin
7cc5446484 Fix incorrect path in Pillar documentation 2014-09-22 09:04:48 +02:00
Henrik Holmboe
c43a99242c Minor doc change 2014-09-04 17:27:02 +02:00
Nitin Madhok
ef05362c6c Fixing more sphinx errors and violations 2014-09-03 16:05:36 -06:00
Erik Johnson
892a78ea1c Double-backticks for formatting consistency 2014-09-01 15:07:03 -05:00
Jille Timmermans
30bce1dafa Small documentation fix in pillars 2014-09-01 13:13:12 +02:00
Nitin Madhok
b526ee2aab Fixing more sphinx errors and violations 2014-09-01 02:44:27 -04:00
Mike Place
65f232e066 Docs on merging pillar keys 
Refs #14916
 2014-08-26 15:48:51 -06:00
David Boucha
859eaa1468 add example of pillar on the Cli 2014-08-25 14:05:39 -06:00
David Boucha
8da4eb3ab5 fix whitespace issues 2014-08-25 14:01:16 -06:00
David Boucha
c016bf5db2 remove whitespace 2014-08-25 13:59:16 -06:00
Clayton Parker
23c494c8ce fix errors in docs 2014-06-25 22:54:37 -04:00
Mike Place
e01becc217 Improve initial pillar doc 
I think the pillar intro was too light on details. Hopefully this makes
it easier to follow.
 2014-06-24 16:47:45 -06:00
Erik Johnson
0f7c91b9e0 Add external ref target for pillar targeting 2014-06-17 17:20:50 -05:00
Chris Rebert
8af229253f more copyediting 2014-04-30 13:55:48 -07:00
viod
f6bd8415b3 Add the indication that pillar_roots should not be subdirectories of file_roots, as that won't work, everywhere it looks relevant. 2014-03-03 00:15:51 +01:00
Mike Place
6af7ff5dff First pass at refactoring Salt documentation. 2014-02-26 13:31:11 -07:00
Colton Myers
5b90e371ce Fix pillar include example 
Fixes #9034
 2013-12-05 09:33:51 -07:00
Colton Myers
c4dde69a2f Add note about pillar.get() vs salt['pillar.get']() in templates, Fix #7566 2013-10-16 15:43:03 -06:00
Henrik Holmboe
4ba3b77d5b Single vs double backtick 2013-10-07 08:25:15 +02:00
Henrik Holmboe
4fe8c529c0 Some minor changes to the documentation 2013-09-04 14:48:17 +02:00
Erik Johnson
cf365f77cd Convert shell command examples to bash code-block 
This commit modifes a number of files which have command-line examples
so that the code-block directive is used. This provides more
visually-appealing syntax highlighting.

More commits like this will follow, this commit is part of an overall
documentation audit that I am performing.
 2013-08-10 21:55:51 -05:00
Seth House
db4d7bcb59 Added rST anchors to pillar and GitFS for easy cross-referencing 2013-08-07 14:34:47 -06:00
Erik Johnson
eb339ef1fa Replace references to 0.16.1 with 0.16.2 2013-08-01 20:10:45 -05:00
Erik Johnson
17d206b783 Punctuation fix in pillar docs 
Sentence is missing a period at the end.
 2013-07-29 19:56:06 -05:00
Joseph Hall
16f28ca935 Merge pull request #6343 from go8ose/note-pillar-flat 
Document how the pillar namespace is flattened.
 2013-07-27 06:46:18 -07:00
Geoff Crompton
c0588d42db Document how the pillar namespace is flattened. 2013-07-27 16:35:55 +10:00
Geoff Crompton
a6b11e3424 Mention in pillar topic which version introduced pillar includes. 2013-07-26 20:28:10 +10:00
Pedro Algarvio
5886ea384d Link to dictionaries in the python documentation. 2013-07-23 17:59:18 +01:00
Erik Johnson
f863417790 Update references to pillar.data in docs 2013-07-22 16:09:51 -05:00
Thomas Jackson
c1243d6393 Update pillar topic docs to match what it does 
#6084
 2013-07-10 08:19:46 -07:00
Matthew Williams
0575cffee7 pillar: docs for include (tweak) 2013-06-30 22:22:01 -07:00
Matthew Williams
3e8e36d67b pillar: docs for include 2013-06-30 22:20:27 -07:00
Erik Johnson
6de20853b0 Improved pillar docs 
This commit adds documentation on the pillar.get function, and also
converts a couple references to some of the execution functions to links
to the docstring for that function, for better navigation.
 2013-06-18 19:26:21 -05:00
Erik Johnson
88d7839cef Replace 2nd-person wording 
This commit re-does the updates from #5536 without using 2nd-person
pronouns.
 2013-06-13 21:05:19 -05:00
Erik Johnson
e8b08318f7 Add examples of targeting nested pillars 2013-06-13 20:29:04 -05:00
Thomas S Hatch
2d5d4d8cf2 Fix #4536 2013-04-22 12:00:14 -06:00
Thomas S Hatch
99e2b56d68 Merge pull request #4458 from joehealy/fix_man_typos2 
Fixed typos
 2013-04-10 10:36:46 -07:00
Joe Healy
07c4814a4e Fixed typos 2013-04-11 02:00:20 +10:00
Tim Hollinger
246a411178 minor change 
s/to/as  line 6
 2013-04-05 17:41:39 -06:00
Baiju Muthukadan
ae1aa5a578 pillar can be used to store sensitive data 2013-02-06 11:02:14 +05:30
Baiju Muthukadan
b135b88f6c pillar is no more an experimental add on 2013-02-06 07:37:46 +05:30
Thomas S Hatch
1fe0015c90 update pillar docs 2013-02-05 11:07:44 -07:00
Thomas S Hatch
4cfed31cbe Fix some of the formatting and use a stock grain so people don't 
go looking for a non standard grain
 2013-01-19 22:15:24 -07:00
John Albietz
f6d2914542 updated to add an example of other standard top matching types in pillar files. 
Not sure if you'll like my example, but we should add at least one example of how to use other standard top matching types into the top.sls file.
 2013-01-19 21:04:22 -08:00