valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
67,583 Commits 24 Branches 182 Tags 341 MiB
b2f3cc080f
Commit Graph

167 Commits

Author SHA1 Message Date
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
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
Nicole Thomas
44c7eb4d4b Merge pull request #22169 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-03-31 09:21:36 -06:00
Colton Myers
124ad51c40 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    doc/ref/index.rst
    doc/topics/eauth/index.rst
    salt/beacons/__init__.py
    salt/beacons/service.py
    salt/loader.py
    salt/minion.py
    salt/output/nested.py
 2015-03-30 15:10:17 -06:00
Justin Findlay
294dfe2d94 clarify and expand console log colors help 2015-03-26 23:21:30 -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
Damian Myerscough
822c5ea626 The -F options shows all key fingerprints, -f allows you to filter out a specific key 2015-03-01 14:46:45 -08: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
ec60d03e54 ZeroMQ socket monitoring 
This allows a user to log connection events from a ZeroMQ socket to better diagnose connectivity issues. Requires ZeroMQ 4.x.
 2015-02-17 15:12:13 -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
rallytime
9898fcf613 Merge branch '2015.2' into 'develop' 
Conflicts:
	.gitignore
	.pylintrc
	.testing.pylintrc
	salt/client/mixins.py
	salt/cloud/clouds/msazure.py
	salt/config.py
	salt/modules/mount.py
	salt/runners/doc.py
	salt/utils/event.py
	salt/utils/reactor.py
 2015-01-29 17:24:04 -07:00
Kevin Bowling
23155964f5 Remove unused restart_on_error config 2015-01-27 19:24:29 -07:00
Z. Liu
d46b6b6490 sate_output_profile default to True 2015-01-03 01:36:21 +08:00
Z. Liu
3fce994d30 fix type: statei -> state 2015-01-03 01:26:12 +08:00
Z. Liu
8217f5fa66 add 'state_output_profile' option for profile output 2015-01-02 22:56:39 +08:00
Justin Findlay
e8d4882c0a remove misleading unicode message 2014-12-27 17:38:05 -07:00
Justin Findlay
2d93867c3e add color to console logger 2014-12-27 13:36:57 -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
Thomas S Hatch
2924404f0a Merge pull request #7477 from jacksontj/develop 
Initial addition of minion module memory limit
 2013-10-07 14:07:00 -07:00
Thomas Jackson
67176595b6 Adding docs for modules_max_memory 2013-09-26 16:32:33 -07:00
Joe Healy
aece0976a6 Fixed pedantic spelling errors picked up by lintian 
joe@unstable-builder:~/salt_017rc/salt$ lintian -I ../*.deb
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz softwares software - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz specifed specified - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz Targetting Targeting - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz targetted targeted - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz Dependant Dependent - done
I: salt-common: FSSTND-dir-in-manual-page usr/share/man/man7/salt.7.gz:57301 /var/named/ - not done - example
I: salt-common: FSSTND-dir-in-manual-page usr/share/man/man7/salt.7.gz:57320 /var/named/ - not done - example
I: salt-common: FSSTND-dir-in-manual-page usr/share/man/man7/salt.7.gz:57339 /var/named/ - not done - example
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz recieve receive - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz allows to allows one to - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz allows to allows one to - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz dont don't - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz succesfully successfully - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz softwares software - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz These package This package - not done - legitimate
 2013-09-20 22:01:20 +10:00
Erik Johnson
46d68c8669 Fix inconsistent indentation in config file templates 
In the config file templates, some parameters are commented out with a
pound sign, and others are commented out using a pound sign and a space.
This has led to some confusion when people uncomment some params to use
them and then there are errors when PyYAML tries to render the data.

This commit makes the commenting of config parameters uniform, using
just a pound sign with no extra space.
 2013-09-13 16:32:21 -05:00
Erik Johnson
15640a70c6 Grammar cleanup 2013-08-03 18:51:37 -05:00
Erik Johnson
70e236d028 Docmentation tweaks in advance of 0.16.2 release 2013-07-31 20:43:37 -05:00
Erik Johnson
fae7a1576c Fix warning during minion auth due to invalid config param type 2013-07-27 19:53:15 -05: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
Erik Johnson
17ebff3b9d Fix indentation in the minion config template 
The example for the 'backup' param in the minion config file template is
indented one level further than it should. This commit fixes that.
 2013-07-27 00:28:15 -05:00
Volker Schwicking
cf77eca666 added reconnect dealy for the minion zmq-pull socket 2013-07-17 18:46:43 +02:00
Volker Schwicking
9c82c0e401 add new setting 'random_reauth_delay' which delays the re-auth attempts of a minion by random seconds to receive a changed master-key. 2013-07-08 16:58:29 +02:00
Volker Schwicking
8fbbede033 add new setting 'random_reauth_delay' which delays the re-auth attempts of a minion by random seconds to receive a changed master-key. 2013-07-08 16:47:13 +02:00
Daniel Naegele
daa4007d78 quickfix for IPv6, added basic documentation to the default configs 2013-06-18 02:04:17 +02:00
Chris Rebert
e89cbf4447 capitalize Linux in comments/docs 2013-05-15 19:21:50 -07:00
Colton Myers
03921b3f2e Remove rogue tabs and trailing whitespace in conf/minion 2013-02-25 11:45:42 -07:00
Thomas S Hatch
f7189d9909 Add loop_interval to default minion config 2013-01-14 01:18:40 -07:00
Thomas S Hatch
409221037c Add color optiuon to default minion config 2013-01-10 18:16:24 -07:00
Thomas S Hatch
3c119f48da Add output tot he default minion config 2013-01-10 18:13:31 -07:00
Sean Channel
c363fbe690 localhost -> loghost 2013-01-10 16:59:24 -08:00
Sean Channel
6b35ca83d0 wordsmith logging options 2013-01-10 16:51:44 -08:00
Pedro Algarvio
ca0c9b184d Include remote logging comments in configuration files. Refs #3061. 2013-01-07 17:56:37 +00:00
David Boucha
2f05c94d8a Add Windows Repo configs to config template files 2012-12-31 11:35:31 -07:00
Erik Johnson
6739eca926 cleanup for 8bb8143 2012-12-27 11:29:46 -06:00
D Tucny
d63b0466cf correct documentation in sample config for TCP keepalive option 2012-12-24 10:57:02 +08:00
D Tucny
6ad642a748 Add configurable tcp keepalive support enabled by default 2012-12-24 10:45:02 +08:00
Tris Forster
3b0069db39 Updated config comments to reflect 8d723cd (pidfile / root_dir) 2012-12-22 17:03:19 +11:00
Pedro Algarvio
ba09404238 Allow different date formats for the console and the logfile to be configured. 2012-12-18 13:35:13 +00:00
Sean Channel
0d7732930a drop .template from cfg file names 2012-12-03 23:42:18 -08:00
Jeff Bauer
7f30955675 rename conf files to templates, issue #518 2012-01-16 13:29:49 -06:00
Thomas S Hatch
582199a376 Add missing examples tot he config 2012-01-13 15:29:24 -07:00
Brad Barden
31f7175932 very minor wording correction in config desc 2011-12-31 20:41:55 -06:00
Brad Barden
3bec12e5b7 updated description of acceptance_wait_time 2011-12-31 20:31:06 -06:00
Brad Barden
54c4eefcdb add acceptance_wait_time minion config parameter 2011-12-31 19:53:07 -06:00
Thomas S Hatch
3a32864e9a Add state_verbose: False option to make states less chatty 2011-12-10 00:15:57 -07:00
Thomas S Hatch
862cf236c4 update minion config with new sub_timeout option 2011-10-24 22:48:55 -06:00
Thomas S Hatch
f6c3c31e31 Disable Cython module loading by default 2011-09-14 17:14:56 -06:00
Thomas S Hatch
66222bcebc Fix config to reflect new default value 2011-07-29 20:54:55 -06:00
Erik Nolte
1b9248b1dd Move monitor configuration from /etc/salt/minion to /etc/salt/monitor. 2011-07-28 10:41:28 -06:00
Erik Nolte
63b3ed0032 Add sample monitor configuration. 2011-07-26 15:44:28 -06:00
Travis Cline
dfe8563671 Added new option: root_dir to be prepended to 'pki_dir', 'cachedir', and 'log_file' to aid in non-root installations. 2011-06-20 21:24:50 -05:00