valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
48,874 Commits 24 Branches 182 Tags 341 MiB
d461060efe
Commit Graph

107 Commits

Author SHA1 Message Date
C. R. Oldham
f0c9204d8b Add references to failover parameters in conf 2015-06-23 11:07:45 -06:00
Z. Liu
55db1bf8b5 sate_output_profile default to True 2015-05-27 11:20:15 -06:00
Z. Liu
991922703b fix type: statei -> state 2015-05-27 11:20:14 -06:00
Z. Liu
0549ca6266 add 'state_output_profile' option for profile output 2015-05-27 11:20:14 -06:00
Colton Myers
7ba2404cc9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    conf/master
    conf/minion
    doc/ref/configuration/master.rst
    salt/loader.py
    salt/minion.py
    salt/modules/ssh.py
    salt/output/nested.py
    salt/utils/network.py
 2015-03-25 09:28:04 -06:00
C. R. Oldham
5dbb0d433d Clarify how defaults are indicated in the config files. 2015-03-24 12:10:01 -06:00
Mike Place
9c225cb84d ZeroMQ socket monitoring 
This allows a user to log connection events from a ZeroMQ socket to better diagnose connectivity issues. Requires ZeroMQ 4.x.

Conflicts:
	salt/minion.py
 2015-02-19 10:18:27 -07:00
Mike Place
c96b4725ae Merge pull request #20465 from cachedout/safemode_config 
Fix mismatched config value for auth_safemode
 2015-02-06 08:51:40 -07:00
Mike Place
f9cb6cdeeb Fix mismatched config value for auth_safemode 
The actual default is false.

Closes #19945
 2015-02-06 09:19:10 -07:00
Kevin Bowling
23155964f5 Remove unused restart_on_error config 2015-01-27 19:24:29 -07:00
Thomas S Hatch
1dcc05b049 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/yumpkg.py
 2014-12-17 15:00:26 -07:00
Seth House
7ce1becf34 Added note about using log_level_logfile with log_granular_levels 2014-12-16 18:18:21 -07:00
Seth House
90edd2185b Removed trailing comma from log_granular_levels example; is invalid YAML 
Thanks to F. Langelier for the report.
 2014-12-16 18:13:07 -07:00
Colton Myers
472f6577e2 Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/minion.py
	salt/modules/localemod.py
	salt/states/mount.py
	salt/transport/__init__.py
	salt/utils/schedule.py
 2014-12-04 11:11:11 -07:00
QthCN
1f6bb0a012 Add Returner Setting section for returner's config 2014-12-04 00:12:37 +08:00
Seth House
aa964e5d3c Added state_aggregate placeholders to the master/minion conf files 2014-12-02 18:33:10 -05:00
Thomas Jackson
1acf7c0184 Spelling 2014-10-28 08:13:02 -07:00
Mike Place
5ec3d05bc7 Add master_alive_interval to stock minion config 2014-10-23 11:47:00 -06:00
Colton Myers
11ddb3874b Merge branch '2014.7' into develop 
Conflicts:
	conf/master
	conf/minion
 2014-09-26 17:46:10 -06:00
rallytime
4402fd80fb Clean up formatting of minion stock conf file 2014-09-26 15:38:49 -06:00
Colton Myers
36ef47e7a2 Merge branch '2014.7' into develop 
Conflicts:
	conf/minion
	salt/modules/mine.py
 2014-09-02 10:43:31 -06:00
Jille Timmermans
4064a8cf4c Fix some documentation inconsistencies 2014-09-02 11:38:23 +02:00
Jille Timmermans
6de9cb9b3c Small fixes in the comments in conf/minion 2014-09-01 15:18:46 +02:00
Chris Rebert
177c168a21 Fix numerous typos found via Lintian 
Thanks https://github.com/Debian/lintian/tree/master/data/spelling !
 2014-08-11 10:46:43 -07:00
Thomas S Hatch
f76596f403 Merge pull request #14819 from steverweber/fix_more_tries 
auth_tries should be repeated
 2014-08-07 12:27:05 -06:00
steve
95862351d0 auth_tries should be repeated 2014-08-07 09:43:06 -04:00
steve
bc3ade860c catch exceptions and fix some vars 2014-08-05 22:39:57 -04:00
steverweber
bf8f936fa4 fix issues with keepalive minion 2014-07-25 15:13:05 -04:00
Thomas S Hatch
bb178a9a0d Revert "change minion auto restart to multiprocessing mode" 2014-07-23 13:46:23 -06:00
steverweber
ea1fc7295b change minion auto restart logic into multiprocessing to fix mem leaks 2014-07-23 11:28:27 -04:00
Khris Richardson
1acd82f3f1 add sphinx spelling extension. enforce en_us 2014-07-13 13:43:33 -05:00
Germán Jaber
a801446af8 Added state_output_diff to the minion config file 2014-06-26 23:31:10 -04:30
Mathieu Le Marec - Pasquet
da758409d4 make color stripping configurable 2014-06-20 09:53:28 +02:00
David Boucha
83aeb96731 Fix metric math example 2014-05-30 11:15:24 -06:00
Jason Mehring
b462864787 Added a _utils sync mechanism for distributing utility source files to minions (#12712) 2014-05-16 14:59:50 -04:00
Thomas S Hatch
65b6d0e005 Merge branch 'fix_ddns2' of git://github.com/steverweber/salt into steverweber-fix_ddns2 
Conflicts:
	salt/config.py
 2014-04-30 13:00:26 -06:00
Mike Place
79a758e3aa Raise max to 1 MiB. 
Otherwise, the loader will tank.
 2014-04-29 17:09:14 -06:00
Mike Place
0b1da0dd84 Use KiB 2014-04-29 17:09:14 -06:00
Mike Place
97598126a3 Max message size for event bus. 
Closes #11372
 2014-04-29 17:09:14 -06:00
s8weber
55e38a9319 Minion restart if master is not responding 2014-04-28 12:26:54 -04:00
Mike Place
756b0e386b Remove hard-coded MD5 wherever possible. 
Doing so helps Salt to achieve FIPS compliance. Closes #11486 and #7318.
 2014-04-07 14:14:19 -06:00
Chris Cormier
da2655111d Add minion auth retry on rejection 2014-03-24 14:16:31 -04:00
Jon Henry
cf91e9638d Add random_master minion config option, which will randomize the list of available masters if set to True 2014-02-06 10:17:35 -07:00
Jon Henry
478747b7d5 Document new auth_timeout option in sample minion config 2014-02-05 10:36:17 -07:00
Mike Place
a4c78e5866 Grains caching layer 
* Creates a new flag for salt-call called '--skip-grains' that will completely bypass the grains loader. (Mostly for testing. Will break many modules in practice!)

* Creates a new flag for salt-call called '--refresh-grains-cache'. This forces a refresh of the grains cache on a minion.

* Adds a new minion config option called 'grains_cache'. Defaults to False.

* Adds a new minion config options called 'grains_cache_expiration'. Specifies the number of seconds allowable for before a minion grain cache is declared to be stale.

* Correct a potential syntax error in the minion config variable, 'grains_refresh_every'.

* Modify the 'apt' module so that it does not stack-trace in virtual() if grains aren't loaded.

* A new caching layer for the grains loader that can write to and read from a msgpack'd serialized data file containing grains that is stored in the minion cache.
 2014-01-23 15:09:22 -07:00
Thomas S Hatch
6a922d30eb Use correct yaml in examples 2014-01-12 01:10:17 -07:00
Mike Place
ad98ed11ad A minion with locally defined fileroots may also deep-recurse. Allow the minion to limit this behavior through a configuration option. 2013-11-01 09:19:30 -06:00
Thomas S Hatch
e49504e35d hard default grains refresh to be disabled 2013-10-22 07:22:45 -06:00
Mike Place
2209f421ee Re-write to use Scheduler instead of threads. 2013-10-18 15:53:27 -06:00
Mike Place
b5c6ead7a6 First pass at an automated check in the minion tune-in loop, using a threaded approach to periodically refresh the master if the grains on a minion have changed. 2013-10-18 12:56:54 -06:00