Commit Graph

183 Commits

Author SHA1 Message Date
Thomas L. Kula
54a0746b4e Backoff when minion fails to connect
NOTE: This is a potential change --- I haven't actually gotten a
test environment to try this out.

This adds a configuration option to the minion,
`acceptance_wait_time_max', that if set changes the acceptance
wait loop to add `acceptance_wait_time' seconds to the wait between
each iteration, up to this maximum value.

POTENTIAL FIX: Issue #5813
2013-07-27 16:51:38 -04:00
Pedro Algarvio
e46e81e1f2 Direct link to python's documentation regarding the LogRecord attributes. 2013-07-23 16:59:47 +01:00
Pedro Algarvio
868cfad2d0 Link minion.rst to time.strftime's python documentation. 2013-07-23 16:55:23 +01:00
Pedro Algarvio
70b57bd0a2 Link master.rst to time.strftime's python documentation. 2013-07-23 16:46:05 +01:00
Erik Johnson
a5627b0cc7 Tweak description of "id" minion config param 2013-07-20 21:14:59 -05:00
Mathieu Le Marec - Pasquet
cff1fa6f53 fix/feat: let the syndic be way more configurable
- Fix micmac between configs
- Add options to configure pidfile, logfile, masterofmaster port

This fixes #6024.
2013-07-15 20:30:26 +00:00
Seth House
059b287f65 Fixed two rST mistakes 2013-07-01 13:42:59 -06:00
martin f. krafft
c7053e9adf Reclass master_tops/ext_pillar docs update
Signed-off-by: martin f. krafft <madduck@madduck.net>
2013-07-01 15:01:11 +02:00
ran
38aa906da0 fix mine while caching is disabled 2013-06-25 23:42:09 +03:00
Colton Myers
ef4ba74c10 Add additional clarification for autosign in docs 2013-06-17 16:28:05 -06:00
Jonathan Ballet
69d77d8c1a output: fix typo introduced in 5f473b 2013-06-17 17:31:44 +02:00
Jonathan Ballet
5f473bb17e output: new state output 'changes'
It displays states result in 'full' mode unless nothing changed, in
which case it displays results in 'terse' mode.
2013-06-17 15:22:57 +02:00
Seth House
370dc7881b Removed line numbers from master/minion conf file examples
This change is to lazily side-step Sphinx issues rendering code
alongside line numbers. Aligning the line numbers <td> with the code
<td> is dumb and I'd like to patch the HTMLWriter to output
Bootstrap-compatible <ol>'s instead.
2013-06-12 12:15:40 -06:00
Thomas S Hatch
594eb74968 Add docs on minion_data_cache 2013-06-11 10:35:45 -06:00
yinchuan
b80f904853 Node Groups: 'L@foo.domain.com,bar.domain.com,baz.domain.com or bl*.domain.com' not 'and'
use 'and' at this confuse me, and in the http://docs.saltstack.com/topics/targeting/nodegroups.html also use 'or'.
2013-05-29 11:08:32 +08:00
Colton Myers
9a2c99419d Add docs for state_output: 'mixed' 2013-05-06 15:40:13 -06:00
Thomas S Hatch
ac05ae467c Add some docs on minimum worker threads 2013-04-22 11:05:30 -06:00
Gary Wilson Jr
bd499e5640 Fixed several minor misspellings and acronym capitalizations. 2013-03-18 16:42:57 -05:00
Bruno Clermont
390c5898c4 we're talking about master configuration here.
fix copy-paste from doc/ref/configurations/minion.rst.
2013-02-21 16:15:27 +08:00
Thomas S Hatch
9e1001cb3b Fix some spelling 2013-02-04 09:40:21 -07:00
Thomas S Hatch
65d4d84295 Docs per #3543 2013-02-02 15:47:04 -07:00
Pedro Algarvio
13b6e35668 Remove pub_refresh and sub_timeout from both documentation and salt.config. 2013-01-15 23:20:01 +00:00
Seth House
32c944c1e9 Changed syntax highlighting from ini to yaml since conf files are yaml 2013-01-11 14:27:09 -07:00
Seth House
f7663df9b6 Fixed paths to the master/minion conf files 2013-01-11 14:26:28 -07:00
Sean Channel
6b35ca83d0 wordsmith logging options 2013-01-10 16:51:44 -08:00
Sean Channel
54634188b2 copy/paste typo 2013-01-09 23:55:13 -08:00
Sean Channel
77d24868af update logging options 2013-01-09 23:45:11 -08:00
Erik Johnson
86c10c673d Leave off trailing slash
None of the other directory paths have a trailing slash, this commit
makes a small aesthetic change.
2012-12-31 04:32:03 -06:00
Erik Johnson
6739eca926 cleanup for 8bb8143 2012-12-27 11:29:46 -06:00
Erik Johnson
8bb8143ee3 Add missing config params to minion conf docs
I noticed earlier tonight when I added some information to the "hacking"
docs that my "root_dir" and "sock_dir" links were not actually linking
to anything, and found that they were missing from the minion
configuration page. It turns out that there were a good many params that
hadn't made their way into the docs yet, so I added as many of them as
I could identify.
2012-12-26 22:58:35 -06:00
Erik Johnson
92ab669a1f Provider doc enhancements
1) Added an example for the minion config option "providers".

2) Cleaned up line widths on solaris install instructions, and added
   information on how to use pkgutil as the default package provider.

3) Since systemd is the default provider for Arch Linux now, I corrected
   the information in the "State Providers" page so that the example of
   overriding the service provider reflects the current state of the
   codebase.
2012-12-21 21:40:01 -06:00
Thomas S Hatch
85d6d584a5 Add docs to the master for state_output and state_verbose
Fix #2857
2012-12-10 17:39:21 -07:00
Thomas S Hatch
ee0158ebe2 Add state_output option docs 2012-12-10 17:37:42 -07:00
Mike Yumatov
bafd02e827 Fix pillar_roots configuration example 2012-11-12 10:12:40 +04:00
Seth House
e55262f60a Added a documentation anchor for the master/minion config 2012-10-25 15:31:38 -06:00
Seth House
c6f7337ecd A bevy of line-length adjustments and misc rST fixes 2012-10-25 14:36:02 -06:00
G. Clifford Williams
5886991459 another minor typo correction 2012-10-25 12:26:52 -05:00
G. Clifford Williams
6b0ea10b7e minor typo correction 2012-10-25 12:19:35 -05:00
Thomas S Hatch
a6ac5ce8f3 Add some docs 2012-10-11 23:01:18 -06:00
Seth House
207c826cde Added providers config option to docs 2012-10-11 14:17:10 -06:00
Seth House
4246b27ff0 Fixed misc rST syntax errors 2012-10-04 18:52:51 -06:00
Thomas S Hatch
818c2bafaa Fix #2125 2012-09-27 19:28:08 -06:00
Aaron Tygart
d445ad0e2b Merge branch 'upstream/develop' into mongo_pillar 2012-09-22 23:30:56 -05:00
Sean Channel
974a7042ed add backup_mode to minion config and config reference 2012-09-21 18:48:41 -07:00
Aaron Tygart
892afaef7f Add Esky documentation 2012-09-12 00:23:31 -05:00
Aaron Tygart
c8cef428ca Add configuration documentation for esky
* Add example in minion configuration template
* Add details in minion configuration documentation
2012-09-11 22:44:00 -05:00
Aaron Tygart
89630283cc Update doc references to include ext_pillar docs 2012-08-27 13:53:25 -05:00
Ulrich Dangel
6fda0d22e7 Mention autosigning in master documentation 2012-08-24 16:20:19 +01:00
Ulrich Dangel
878e53db1b Update documentation about default includes 2012-08-24 16:14:21 +01:00
Thomas S Hatch
32856600c2 Add client_acl to master config docs 2012-08-18 00:34:40 -06:00
Andy Sykes
29c2763527 Fix documentation oops in 'include' option 2012-06-26 21:55:21 +01:00
Andy Sykes
df096d754f Documentation oops 2012-06-26 20:54:56 +01:00
Andy Sykes
fbbe74bb35 Bugfixes/documentation update for the 'include' option
Bugfixes:
- handle case where 'include' option has an empty value
- globs were not handled correctly
- warning issued if any include option fails to match any files; this
may be deliberate by the user, but it's there to catch the case where
someone typos the path

Documentation updated with a few examples of how to use it. Minion
template config file also updated with similar examples.
2012-06-26 20:53:27 +01:00
Thomas S Hatch
9737c36708 Add docs for job_cache 2012-06-13 15:50:31 -06:00
Thomas S Hatch
ac4510fb42 Add reference documentation for peer_run 2012-06-02 21:05:17 -06:00
L.C. Rees
3315dad9e7 documentation updates 2012-05-22 22:43:12 -06:00
Thomas S Hatch
0ab61b32c8 Add cython_enable to master docs 2012-05-21 14:36:34 -06:00
Thomas S Hatch
89f8e59103 Add docs for new runner_dirs option, fix #1301 2012-05-18 18:39:22 -06:00
Thomas S Hatch
80f754a773 update some config docs 2012-04-27 13:13:42 -06:00
Gordon McAllister
72c2014767 War on typos
Also cleanup whitespace and break some long lines
2012-03-14 17:09:19 -07:00
David Boucha
ea83a765a3 Fix a typo 2012-03-08 21:08:45 -07:00
David Boucha
3a5bb0407d Various Doc fixes.
Mainly small typo fixes and clarifying some language
2012-03-08 21:05:52 -07:00
Seth House
6564683052 Updated legacy reference to the minion id as 'hostname' 2012-02-24 23:44:31 -07:00
Thomas S Hatch
427666236d Add environment to the configuration guide 2012-02-09 11:57:37 -07:00
Thomas S Hatch
483c33bc7c Add the documentation for the external-nodes option 2012-02-09 11:45:59 -07:00
Thomas S Hatch
cb80f70cdb Merge pull request #543 from rubic/develop
updated documentation for user, fixed configuration template links
2012-01-18 21:30:21 -08:00
Jeff Bauer
d67c7f5613 updated documentation for user, fixed configuration template links 2012-01-18 23:04:48 -06:00
Thomas S Hatch
f89e89d850 add docs for new config param cache_jobs 2012-01-18 00:04:14 -07:00
Seth House
b9dc071b45 Added host of reST fixes for the release 2012-01-15 22:54:23 -07:00
Thomas S Hatch
3e2ac7f81e fix copy/paste oversight 2012-01-13 20:04:28 -07:00
Thomas S Hatch
4ef171b6a2 Finish adding the contents of the minion configuration guide 2012-01-13 17:27:43 -07:00
Thomas S Hatch
a24a880e56 fix ref to logfile in master configuration ref 2012-01-13 17:27:21 -07:00
Thomas S Hatch
4678e93b09 add some docs to the minion config manager 2012-01-13 14:17:54 -07:00
Thomas S Hatch
e9a69b1265 update config guide for the master 2012-01-13 12:35:56 -07:00
Markus Gattol
dcf2eab462 added missing whitespace after ,
Signed-off-by: Markus Gattol <markus.gattol@sunoano.org>
2011-11-15 10:37:06 +00:00
Seth House
a912520cf8 Reorganized and reworded the contents page for better focus
Also moved the TOC to its own doc to provide a complete and
comprehensive overview. Removed some extra and unecessary toctree calls.
2011-10-30 12:41:14 -06:00
Seth House
29a564d6f5 Split the configuration doc into master/minion configuration docs 2011-10-30 10:04:21 -06:00
Erik Nolte
1ca58adb79 Fix spelling error: recieve -> receive 2011-07-27 17:46:53 -06:00
Thomas S Hatch
846ced7727 Fix typos in configuration docs 2011-06-24 22:38:27 -06:00
Thomas S Hatch
2924d7f58b Fix indentation and underlines 2011-06-22 20:55:35 -06:00
Thomas S Hatch
736f4d6963 fix code-block statements 2011-06-22 20:41:10 -06:00
Thomas S Hatch
acf80db54b Some updates on the configuration guide 2011-05-30 22:16:25 -06:00
Seth House
20f18681bd Added initial Sphinx documentation
This commit moves the existing wiki pages on Github into rST with only
minor edits, formatting, and hyperlinking.
2011-05-27 06:27:42 +08:00