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
63,369 Commits 24 Branches 182 Tags 341 MiB
c1bd1e610b
Commit Graph

157 Commits

Author SHA1 Message Date
Dmitry Kuzmenko
7a5204ef02 Deprecate client_acl with publisher_acl (rename) 
Keeping client_acl support
 2015-10-23 11:59:40 +03:00
Thayne Harbaugh
625a129445 Additional corrections to use option defaults directly from salt.config 
* correct 'id' entry in salt.config
  * add 'event_match_type' in salt.config
  * ensure that hash is only calculated in minion since it isn't needed by the master
 2015-10-21 22:15:13 -06:00
Mike Place
1f8d65c402 Merge pull request #27606 from plastikos/bug-scaling_zmq_hwm 
RFC: Add additional ZMQ tuning parameters necessary for 1k+ minions per master [WIP]
 2015-10-16 10:03:56 -06:00
Jacob Hammons
5a9867aad1 initial engines topic, updates to windows repo docs 
Refs #23239
Refs #27520
 2015-10-05 14:22:59 -06:00
Thayne Harbaugh
2fe799dd0a Add additional ZMQ tuning parameters necessary for 1,000+ minions per server. 
Start collecting tuning parameters together in the master config file.
 2015-10-01 14:52:18 -06:00
Colton Myers
2c2a5f85ac Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    doc/topics/cloud/gce.rst
    salt/cli/api.py
    salt/cli/call.py
    salt/cli/cp.py
    salt/cli/key.py
    salt/cli/run.py
    salt/cli/salt.py
    salt/modules/dockerio.py
    salt/states/dockerio.py
 2015-09-17 10:54:33 -06:00
Colton Myers
66f4641be3 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    doc/conf.py
    salt/__init__.py
    salt/cli/__init__.py
 2015-09-16 18:39:16 -06:00
Mike Place
507fb04683 Issue warning that some log levels may contain sensitive data 2015-09-14 15:39:17 -06:00
Colton Myers
274464a85b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/reactor/index.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/groupadd.py
    salt/modules/localemod.py
    salt/modules/mysql.py
    salt/modules/useradd.py
    salt/modules/win_pkg.py
    salt/modules/win_useradd.py
    salt/netapi/rest_cherrypy/app.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/htpasswd.py
    salt/states/user.py
 2015-09-14 14:39:03 -06:00
Jacob Hammons
2401533d9e New content added to beacon docs. 2015-09-09 11:16:55 -06:00
Justin Findlay
559512b0a6 add default_top description to docs 2015-08-26 01:44:33 -06:00
Mike Place
a5522f1581 Removed incorrect default config 2015-08-11 11:29:06 -06:00
Mike Place
cfb6982227 Adding some dictupdate merge tests 
Add new option for top_file_merging_strategy to config

Add master config file option

Adding additional tests

Lexicographical test works

Make default strategy

Simplify to just an option about whether or not to merge

Changes

Implement ordered top files

Implement merge strategies and default top files

Lint

Doc rewrite and start on ordering

Remove debugging

Moving to env_order

Adding env_order

Still writing tests

More tests and docs
 2015-08-11 11:28:40 -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
Jacob Hammons
3f3db4bd8e Additions for #24042 2015-07-30 15:43:21 -06:00
Jacob Hammons
db2129b199 Minor doc bug fixes 
Refs #24042
Refs #25650
Refs #21296
Refs #23788
 2015-07-30 14:39:15 -06:00
Justin Findlay
d73964ea3c add console_log_fmt color documentation 2015-07-28 16:16:29 -06:00
Colton Myers
2ae0d7d302 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/modules/win_file.py
 2015-06-16 15:13:53 -06:00
Mike Place
b7bb7eaeb2 Note about minimum worker_threads 2015-06-15 11:43:14 -06:00
Colton Myers
ece63c36a3 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/ssh/roster.rst
    salt/modules/win_groupadd.py
 2015-05-06 15:49:50 -06:00
Colton Myers
2981aed48e Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-05-05 16:49:31 -06:00
Colton Myers
fd09cdae6f Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/ssh/roster.rst
    salt/client/ssh/__init__.py
    salt/client/ssh/wrapper/__init__.py
    salt/config.py
    salt/modules/file.py
    salt/runners/lxc.py
 2015-05-05 16:26:39 -06:00
Colton Myers
87fc3161f9 Add Salt-SSH section to master config template 2015-05-04 15:05:12 -06:00
Steve Weber
36b1c87dd2 include module_dirs 
include module_dirs because its more flexible than extension_modules.
 2015-05-04 12:53:50 -04: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
rallytime
609dcdbac1 Add default for pillar_source_merging_strategy in conf/master file 
Fixes #21511
 2015-03-24 14:53:18 -06:00
C. R. Oldham
a35f38a71e Clarify how defaults are indicated in the config files. 2015-03-24 12:27:51 -06:00
C. R. Oldham
5dbb0d433d Clarify how defaults are indicated in the config files. 2015-03-24 12:10:01 -06:00
Colton Myers
d17c908b42 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/pillar/index.rst
	salt/beacons/diskusage.py
	salt/beacons/network_info.py
	salt/minion.py
	salt/modules/iptables.py
	salt/modules/nacl.py
	salt/modules/win_firewall.py
 2015-03-09 12:52:14 -06:00
s8weber
ad869c74b1 add pillar_safe_render_error config 
allow a salt admin to config if the detailed render error of pillars
can be passed to the minion.
 2015-03-04 10:22:29 -05: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
Thomas S Hatch
fc8535e09f Merge pull request #18702 from wolfpackmars2/patch-1 
Propose update to master config file
 2014-12-04 16:41:43 -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
Joseph Hall
85bdf64ecb Merge pull request #18677 from QthCN/develop 
Add Returner Setting section for returner's config
 2014-12-04 05:49:44 -07:00
Steve Groesz
b65e12e790 Propose update to master config file 
Per the documentation: http://docs.saltstack.com/en/latest/ref/configuration/master.html#include-configuration  the include directive is unset by default.  As documented at the top of the master config file: "Values that are commented out but have no space after the comment are defaults that need not be set in the config. If there is a space after the comment that the value is presented as an example and is not the default."  Therefore, I propose adding a space after the comment to clarify that this is an example directive and not the default.
 2014-12-03 21:12:13 -06: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
Mike Place
b0a3d2b87b Event return filtering 2014-12-01 13:05:21 -07:00
Mike Place
8877ba7d78 Ability to queue event returns 2014-12-01 11:46:27 -07:00
Mike Place
5594be2708 Now fires events to specified returner 2014-11-26 16:31:44 -07:00
Mike Place
36017c0911 Configuration gate 2014-11-26 15:37:01 -07:00
Damian Myerscough
3ed419288a sudo_client acl directive 2014-11-17 14:13:06 -08:00