valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
68,226 Commits 24 Branches 182 Tags 341 MiB
5f42fd4486
Commit Graph

164 Commits

Author SHA1 Message Date
rallytime
c386d70742 Merge branch '2015.8' into 'develop' 
Conflicts:
  - salt/modules/alternatives.py
  - salt/modules/boto_rds.py
  - salt/modules/mount.py
  - salt/states/boto_iam.py
 2015-12-29 15:51:12 -07:00
Jonathan Ballet
6922da46dc doc: fix warnings + some rendering issues 2015-12-21 13:26:02 +01:00
Christophe Drevet-Droguet
03fe8c7885 grains_deep_merge config option documentation 2015-11-18 20:48:11 +01:00
Colton Myers
8a23181dd7 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/modules/boto_secgroup.py
    salt/modules/rabbitmq.py
    salt/modules/win_system.py
    salt/modules/yumpkg.py
    salt/states/mount.py
 2015-11-09 17:05:43 -07:00
Colton Myers
aeeaa7c90d Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/config.py
    salt/minion.py
    salt/pillar/s3.py
 2015-11-09 12:12:24 -07:00
Thomas Jackson
f63c2d70a7 Rework minion return_retry_timer 
This feature originally would randomize between 1 -> return_retry_timer, which meant you could always had the possibility of haing a return retry with a timeout of 1s. This change maxes both ends of the range configurable (similar to how acceptance_wait_time is configured). In addition I've added coverage in the minion configuration documentation.

Cleanup of #27286
Fixes #28577
 2015-11-06 18:05:45 -08:00
Thomas Jackson
cfb768ac30 Clearer documentation of the multiprocessing option 2015-10-22 08:45:54 -07:00
Aaron S.
3d866f773d log_level default is info 
see https://github.com/saltstack/salt/blob/develop/salt/config/__init__.py#L855
 2015-09-18 13:59:01 -07:00
Jacob Hammons
f7a9e25d52 Fixed sphinx / latex build warnings and errors 
Added missing modules to contents
 2015-09-17 09:23:24 -06:00
Jeremy Rosenbaum
763ee20713 documentation for zip archive modules 2015-08-26 12:18:57 -06:00
Erik Johnson
b04bc228d0 Correct some inaccurate documentation, fix formatting 2015-08-21 02:38:12 -05:00
Colton Myers
1502a39779 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    conf/minion
    salt/client/__init__.py
    salt/states/dockerio.py
    salt/utils/event.py
    tests/unit/utils/event_test.py
 2015-08-11 18:12:21 -06:00
Colton Myers
32f5345d7d Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    conf/minion
    doc/conf.py
    salt/modules/file.py
 2015-08-10 10:56:40 -06:00
Erik Johnson
157b1c8b11 Add masterless winrepo config params to minion config docs 2015-08-09 17:42:13 -05:00
Jacob Hammons
d220c83f77 master_finger configuration docs 
switch a script to use https:// instead of http://
Refs #25751
 2015-08-06 20:23:22 -06:00
Colton Myers
f4cb659a2a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/windows/windows-package-manager.rst
    salt/modules/event.py
    salt/returners/carbon_return.py
    salt/state.py
    salt/states/pkg.py
 2015-08-03 14:50:50 -06:00
Justin Findlay
7e121de907 Update minion.rst 2015-07-31 17:34:07 -06:00
Colton Myers
e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    debian/changelog
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/cloud/clouds/vmware.py
    salt/config.py
    salt/fileclient.py
    salt/minion.py
    salt/modules/chocolatey.py
    salt/modules/localemod.py
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/schedule.py
    salt/modules/state.py
    salt/modules/win_file.py
    salt/modules/win_pkg.py
    salt/state.py
    salt/states/file.py
    salt/utils/args.py
    tests/unit/states/file_test.py
 2015-07-30 16:54:44 -06:00
Justin Findlay
d73964ea3c add console_log_fmt color documentation 2015-07-28 16:16:29 -06:00
Mike Place
0dc28ad3e4 Return to str for master_type for 2015.5 2015-07-24 11:55:56 -06:00
Colton Myers
76e468bc20 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/cloud/clouds/vmware.py
    salt/daemons/flo/core.py
    salt/modules/hipchat.py
    salt/modules/lxc.py
    salt/modules/rabbitmq.py
    salt/pillar/s3.py
    salt/states/dockerio.py
    salt/states/file.py
    salt/utils/process.py
    salt/utils/s3.py
 2015-07-20 13:55:14 -06:00
Jeff Quast
e947d8ec5a docfix: "cache_jobs: False" => grains_cache: False" 
At the currently rendered anchor link: http://docs.saltstack.com/en/latest/ref/configuration/minion.html#grains-cache

We see the use of "cache_jobs" in the yaml example for the section describing "grains_cache"
 2015-07-16 09:24:07 -06:00
Colton Myers
24d51fb8f1 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/configuration/minion.rst
    salt/config.py
    salt/modules/sudo.py
    tests/integration/states/file.py
 2015-07-02 09:46:36 -06:00
Justin Findlay
44cb167744 adding sudo_user minion config docs 2015-06-30 03:10:56 -06:00
Colton Myers
acb7c6f52b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/minion.py
    salt/modules/network.py
    salt/utils/cloud.py
    salt/utils/job.py
 2015-06-24 11:44:04 -06:00
C. R. Oldham
90c73ff446 References to documentation. 2015-06-23 11:40:06 -06:00
Colton Myers
a5c9681672 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/releases/version_numbers.rst
    salt/cli/batch.py
    salt/minion.py
    salt/state.py
    setup.py
 2015-06-18 11:43:11 -06:00
Michael Steed
f92a769d35 Remove doc references to obsolete minion opt 2015-06-17 15:29:50 -06:00
Colton Myers
94d6ef1d17 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/salt.modules.ipmi.rst
    doc/ref/states/all/salt.states.tls.rst
    doc/topics/cloud/index.rst
    doc/topics/cloud/vsphere.rst
    doc/topics/eauth/index.rst
    salt/cli/batch.py
    salt/modules/cmdmod.py
    salt/modules/ipmi.py
    salt/netapi/rest_cherrypy/app.py
    salt/runners/http.py
    salt/states/boto_elb.py
    salt/states/dockerio.py
    salt/states/linux_acl.py
    salt/states/win_servermanager.py
    salt/wheel/config.py
 2015-06-09 11:41:07 -06:00
Jacob Hammons
d45c4ed11f Bug fixes and build errors 
Refs #23211
Refs #24268
Refs #24235
Refs #24193
Refs #24172
Refs #19901
Refs #19801
 2015-06-05 17:32:35 -06:00
Colton Myers
befb666623 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/modules/mongodb.py
    salt/utils/http.py
    salt/utils/process.py
    tests/integration/__init__.py
 2015-04-27 10:28:53 -06:00
Colton Myers
a18e017619 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/man/salt.1
    doc/ref/cli/salt.rst
 2015-04-24 10:07:48 -06:00
Justin
8486e17ab3 Added retry_dns to minion doc. 2015-04-23 15:33:59 -06:00
Thomas S Hatch
457ec179ae Add sudo user docs into salt 2015-04-08 14:41:05 -06:00
Mike Place
3bc74501e4 Document many core opts 
Although these are documented in other places, we need somewhere that we
can store more in-depth, interface-specific information about various options.

This way, we can make implementation-specific comments which would not be approrpiate
for user configuration files.
 2015-04-03 17:17:06 -06:00
dsumsky
6d797f50d4 - log_level_logfile and log_level configuration options inheritance docu updated 2015-02-12 19:47:59 +01:00
Thomas Jackson
da3ea213e9 Comma cleanup 2014-12-12 11:34:34 -08:00
Nitin Madhok
5d8ae4e32f Fixing sphinx violations and errors 2014-11-18 02:53:40 -05:00
vs
692252f41b Merge branch 'sreq_cache_option' into optional_sreq_caching 2014-10-23 15:55:26 +02:00
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
vs
2e1d3b07b8 add cache_sreqs option to minion documentation 2014-10-16 07:33:37 +02: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
Seth House
e55262f60a Added a documentation anchor for the master/minion config 2012-10-25 15:31:38 -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
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
Ulrich Dangel
878e53db1b Update documentation about default includes 2012-08-24 16:14:21 +01: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