Pedro Algarvio
229eb00e8d
Merge branch '2014.7' forward into develop
...
Conflicts fixed.
Conflicts:
salt/loader.py
salt/returners/carbon_return.py
salt/returners/couchbase_return.py
salt/returners/couchdb_return.py
salt/returners/elasticsearch_return.py
salt/returners/local_cache.py
salt/returners/memcache_return.py
salt/returners/mongo_future_return.py
salt/returners/mongo_return.py
salt/returners/mysql.py
salt/returners/odbc.py
salt/returners/postgres.py
salt/returners/redis_return.py
salt/returners/smtp_return.py
salt/returners/sqlite3_return.py
salt/states/dockerio.py
salt/utils/minions.py
2014-10-19 18:21:19 +01:00
Erik Johnson
49c7e6ac1a
Fix misspelled code-block type
2014-10-15 22:44:27 -05:00
Thomas S Hatch
1468c26ec1
Merge branch '2014.7' into develop
...
Conflicts:
doc/faq.rst
doc/ref/configuration/minion.rst
salt/minion.py
salt/states/pkg.py
salt/transport/__init__.py
2014-10-13 15:03:33 -06:00
rallytime
54b7abdb17
Fix conf_minion references
2014-10-10 09:19:27 -06:00
rallytime
6d1c14b1be
Add recon_* config options to minion docs
...
Fixes #16471
2014-10-08 14:11:34 -06:00
Ryan Lane
9eacaf1832
Add a use_master_when_local option to allow remote execution while using a local file_client
2014-09-28 18:53:43 -07:00
Colton Myers
99e97320e1
Merge branch '2014.7' into develop
...
Conflicts:
doc/ref/configuration/minion.rst
doc/ref/states/requisites.rst
doc/topics/troubleshooting/master.rst
doc/topics/tutorials/index.rst
doc/topics/tutorials/intro_scale.rst
salt/config.py
salt/key.py
salt/master.py
salt/minion.py
salt/modules/file.py
salt/modules/hashutil.py
salt/modules/lxc.py
salt/modules/oracle.py
salt/modules/tls.py
salt/modules/win_update.py
salt/pillar/pepa.py
salt/pillar/s3.py
salt/states/augeas.py
salt/states/win_update.py
salt/tops/ext_nodes.py
salt/utils/master.py
2014-09-22 14:22:54 -06:00
Erik Johnson
70f10cb13e
Fix sphinx build error
2014-09-17 18:00:18 -05:00
Thomas S Hatch
2f6ae96f37
Merge branch '2014.7' into develop
...
Conflicts:
salt/client/ssh/__init__.py
2014-09-03 14:43:07 -06:00
Erik Johnson
510942d3ec
Remove references to masterless salt from gitfs docs
...
Alternate backends do not yet work with the local fileclient.
2014-09-02 15:59:05 -05:00
Mike Place
be60e25574
Merge branch '2014.7' into develop
2014-09-02 13:56:54 -06:00
Erik Johnson
ed631d69b5
Add fileserver_backend param to minion config documentation
...
Also correct an incorrect rst link target for hash_type
2014-09-02 14:36:35 -05:00
Colton Myers
c12f05f83a
Merge branch '2014.7' into develop
...
Conflicts:
salt/modules/aptpkg.py
salt/modules/tls.py
salt/states/boto_asg.py
salt/states/boto_secgroup.py
2014-08-29 16:27:00 -06:00
Mike Place
b2dfdd497f
Add failhard to minion conf doc
...
Refs #15371
2014-08-29 09:39:28 -06:00
Nitin Madhok
7606bfd6cc
Fixing more sphinx warnings and errors
2014-08-11 13:56:43 -04:00
steve
bc3ade860c
catch exceptions and fix some vars
2014-08-05 22:39:57 -04:00
rallytime
a8cd830d52
Change "Helium" to 2014.7.0 in affected docs
2014-07-15 16:53:29 -06:00
Volker Schwicking
3ca39de6d0
add settings for multimaster-pki
2014-07-15 12:10:18 +02:00
Colton Myers
08d7847e44
Add configuration file location for minion (and FreeBSD for master)
2014-07-14 12:22:27 -06:00
Erik Johnson
a61812ce6f
Clean up new master_type feature docs
2014-06-09 11:05:10 -05:00
vs
4661938dd7
add shuffling to the minions master_type=failover functionality
2014-06-02 01:01:16 -07:00
vs
f5009f06fa
reworked master_type section
...
added master being a list of servers
added master_type: failover
2014-05-30 08:00:28 -07:00
Thomas S Hatch
125acd728c
Clean up first person
2014-05-28 09:55:11 -06:00
root
448f3870af
Added documentation on how to use master: module.function and master_type.
2014-05-28 08:20:41 -07:00
Mathieu Le Marec - Pasquet
11ff89000b
Custom grains directories
2014-01-28 13:40:55 +01:00
Seth House
d158fbefd4
Changed conf-log to conf_log to match the other conf_* roles
...
@s0undt3ch Hope you don't mind.
2013-12-13 17:34:59 -07:00
Erik Johnson
3a6274fb3b
Remove reference to yumpkg5 in provider override example
...
yumpkg5 is the default now, so it shouldn't be included in an example of
overriding the provider.
2013-12-09 14:16:19 -06:00
Colton Myers
79fe2637bf
Remove confusing "computer clusters" reference from docs
2013-11-06 12:11:08 -07:00
Forrest Alvarez
a1b4848dbc
Updated minion.rst with a note on verify env for issue 8281.
2013-11-06 05:41:56 +00:00
Pedro Algarvio
0b0e82baaa
Update include documentation examples to current default values.
2013-10-02 13:36:47 +01:00
Pedro Algarvio
e5a8b46b7e
Updated logging documentation on a common place.
...
* All logging information now resides on it's own document where all the currently documented features are explained.
* The master and minion logging configuration sections are now minimal and direct each option to the right place on the logging doc.
* A link to the logging doc was also added to the configuration document topic to help debugging issues when troubles are found.
* Headers fixed in the minion and master configuration docs
2013-08-30 19:32:40 +00:00
Pedro Algarvio
680ca716ec
Add linkable ref's to the minion and master logging configuration sections.
2013-08-30 19:32:39 +00:00
Erik Johnson
ce9b2728a0
Add documentation on how the minion id is derived
2013-08-15 18:03:38 -05:00
Erik Johnson
56fbf9cdbf
Formatting fixes + added File Directory Settings
...
Added the configuration parameters made available with a local
fileclient.
2013-08-03 18:53:39 -05:00
Pedro Algarvio
87472875fe
Replace issue links with the :issue: extlink extension.
2013-08-02 01:04:57 +01:00
Erik Johnson
70e236d028
Docmentation tweaks in advance of 0.16.2 release
2013-07-31 20:43:37 -05:00
Tomé Duarte
7946bef5f3
Fix typo in pidfile code example.
2013-07-30 06:57:34 +01:00
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
Erik Johnson
a5627b0cc7
Tweak description of "id" minion config param
2013-07-20 21:14:59 -05:00
Gary Wilson Jr
bd499e5640
Fixed several minor misspellings and acronym capitalizations.
2013-03-18 16:42:57 -05:00
Pedro Algarvio
13b6e35668
Remove pub_refresh and sub_timeout from both documentation and salt.config.
2013-01-15 23:20:01 +00: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
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
ee0158ebe2
Add state_output option docs
2012-12-10 17:37:42 -07:00
