valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 08:35:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
102,651 Commits 24 Branches 182 Tags 341 MiB
6c2ae8fbd2
Commit Graph

638 Commits

Author SHA1 Message Date
Ronald van Zantvoort
bfbca748e2 highstate output: Document additional output modes 2017-09-25 18:32:52 +02:00
garethgreenaway
7091f8ec71 Merge branch 'develop' into issue36942 2017-09-22 16:33:29 -07:00
Silvio Moioli
fd4194ade0 process_count_max: disable by default 2017-09-22 21:57:54 +02:00
Silvio Moioli
4d181ea523 process_count_max: add defaults and documentation 2017-09-22 21:57:02 +02:00
Daniel Wallace
3bae894306
digitalocean should be one word. 
Everything on their webpage is a reference to DigitalOcean
 2017-09-19 12:47:16 -06:00
rallytime
bfcfcd75e8 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/fileclient.py
  - salt/loader.py
  - salt/minion.py
  - salt/modules/alternatives.py
  - salt/modules/genesis.py
  - tests/unit/modules/test_hosts.py
  - tests/unit/modules/test_ini_manage.py
 2017-09-13 15:15:04 -04:00
rallytime
ef7b4242c3 Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-09-11 12:24:10 -04:00
Ken Jordan
ba0cdd4536 Fix phrasing for mine_interval description 2017-09-01 15:13:20 -06:00
Ken Jordan
9ff03c2d43 Update Salt Mine documentation to show that the mine_interval option is configured in minutes. 2017-09-01 14:57:10 -06:00
rallytime
3d0d9110ac Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/pillar/git_pillar.py
  - salt/utils/files.py
  - salt/utils/process.py
  - tests/unit/utils/test_which.py
 2017-08-24 15:33:15 -04:00
rallytime
bcbe180fbc Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-08-23 10:08:09 -04:00
Denys Havrysh
330d989b46 Import util modules on Master like it works on Minion 2017-08-23 11:28:02 +03:00
Denys Havrysh
af743ff6c3 [DOCS] Add missing utils sub-dir listed for extension_modules 2017-08-22 12:18:42 +03:00
Corvin Mcpherson
78fd3f9b4d Merge branch 'develop' into issue36942 2017-08-17 16:18:46 -04:00
Corvin Mcpherson
2dc593b48e Add jinja environment default options. 2017-08-16 20:02:13 -04:00
Corvin Mcpherson
23e1b23925 Change jinja line statement and line comment prefix default to '' instead of None 2017-08-15 02:13:43 -04:00
Corvin Mcpherson
eb713c699f Add jinja line statement and line comment options to master config. 2017-08-14 19:56:34 -04:00
vernoncole
e970b0623a flesh out saltify driver 
(cherry picked from commit 0a730fb)
 2017-08-07 10:21:48 -06:00
Sigmon, Jeffrey
bb29afd022 Passphrase protect master private key 2017-07-27 13:17:26 -05:00
rallytime
1f0b90aa57 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cloud/clouds/joyent.py
  - salt/engines/slack.py
 2017-07-26 17:51:36 -06:00
rallytime
c673b64583 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - doc/conf.py
  - doc/ref/configuration/master.rst
  - doc/ref/configuration/minion.rst
  - salt/engines/hipchat.py
  - salt/engines/slack.py
  - salt/grains/core.py
  - salt/version.py
  - tests/integration/states/test_renderers.py
 2017-07-20 09:54:08 -06:00
rallytime
b40f980632 Add more documentation for config options that are missing from master/minion docs 2017-07-14 17:26:02 -06:00
rallytime
e512a29f08 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/state.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/pkg.py
  - salt/version.py
  - tests/unit/config/test_config.py
  - tests/unit/modules/test_zypper.py
 2017-06-28 11:31:53 -06:00
Klaus Kämpf
0cf36b487b Run salt master as dedicated salt user 
* Minion runs always as a root
 2017-06-20 17:13:00 +01:00
rallytime
2cfabc467c Merge branch '2016.11' into '2017.7' 
Conflicts:
  - pkg/windows/req.txt
  - salt/modules/dockermod.py
 2017-06-19 14:17:01 -06:00
rallytime
add5b118a3 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/yumpkg.py
  - tests/unit/templates/test_jinja.py
 2017-06-19 14:12:36 -06:00
rallytime
58262608cd Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/config/__init__.py
  - salt/master.py
  - salt/modules/zypper.py
  - tests/unit/modules/timezone_test.py
 2017-06-16 10:43:02 -06:00
rallytime
c828ad803a Add a bunch of config options to the various master/minion files that are missing 
I started on these a while ago and never submitted them. I added a couple more today
and figured I should get these in.

Refs #32400
 2017-06-15 16:21:47 -06:00
rallytime
7fef4cf38f Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/engines/slack.py
 2017-06-15 10:57:27 -06:00
rallytime
89834e49c2 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - conf/master
  - salt/utils/schedule.py
 2017-06-14 13:24:11 -06:00
rallytime
cc07664a9f Replace Nitrogen with 2017.7.0 in remain directories 2017-06-14 12:18:37 -06:00
C. R. Oldham
dadf4b851c Add documentation to the example master and minion configuration files. 
Move minion event signing to a saner place.
Enable dropping messages when signature does not verify or when
minion is not adding the signature to its payloads.
 2017-06-08 13:18:53 -06:00
Felix Dreissig
5b55fb2452 Fix comments about the "hash_type" option 
Previous mentions of the correct default value (it really is sha256)
somehow got lost along the way.
Also, some comments seem to have gotten duplicated instead of updated.
 2017-05-09 11:10:29 -06:00
Mike Place
3031a01266 Merge pull request #41021 from MTecknology/develop 
New feature: automatic job batching
 2017-05-05 10:20:04 -06:00
rallytime
319dc45c1d Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/runners/saltutil.py
 2017-05-04 11:51:32 -06:00
rallytime
19a3ecd5b8 Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-05-03 09:59:09 -06:00
Michael Lustfield
49bd8bfed9 Fixing a spelling error. 2017-05-03 03:21:58 -05:00
Michael Lustfield
a4bae3cda9 Cleaning up (removing) use of safe_batch token. 2017-05-03 03:14:10 -05:00
Michael Lustfield
02614bdfd1 New feature: automatic job batching 
This commit creates a new feature that provides automatic batching of
jobs if the job would have executed on too many minions.

See comments provided in commit for additional details.
Ref: #19054 (https://github.com/saltstack/salt/issues/19054)
 2017-05-03 03:08:24 -05:00
rallytime
fc756c595c Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/configuration/master.rst
  - salt/config/__init__.py
 2017-05-02 12:52:59 -06:00
Matej Urbas
b9591f2807 Fixes typo in conf/master. 
s/utililzed/utilized/
 2017-04-30 11:47:54 +01:00
rallytime
6493880bde Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-04-18 16:42:30 -06:00
Mike Place
8ab321f934 A random startup delay option for minions 
This allows minions to spread out the load to the master if a large number
of them start up at once.
 2017-04-18 08:34:56 -06:00
C. R. Oldham
65ea8997b7 Add allow_minion_key_revoke config option 2017-04-17 13:20:45 -06:00
Nicole Thomas
88f514835d Merge pull request #40677 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-04-13 13:19:07 -06:00
rallytime
e90622bc22 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/dockermod.py
  - salt/modules/file.py
 2017-04-11 15:03:34 -06:00
Daniel Wallace
a86b101ae6 add retries on authentications of the salt minion reconnecting 2017-04-10 14:53:26 -06:00
Mike Place
c41982ed0d
A random startup delay option for minions 
This allows minions to spread out the load to the master if a large number
of them start up at once.
 2017-04-06 12:53:34 -06:00
rallytime
71f3c73150 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/template.py
  - salt/utils/pycrypto.py
  - tests/integration/modules/test_state.py
  - tests/unit/states/test_artifactory.py
  - tests/unit/test_template.py
 2017-04-05 13:02:14 -06:00
Dmitry Kuzmenko
82c45b1a52 Memcache documentation and minor updates. 2017-04-03 19:51:50 +03:00
Mircea Ulinic
18d84dc083 tpyo 2017-03-24 01:55:48 +00:00
Mircea Ulinic
2cfda17165 Add Nitrogen proxy opts to conf 2017-03-24 01:55:48 +00:00
Dmitry Kuzmenko
b09d83b6d7 Allow to use different auth module for ACL. 2017-03-22 11:49:33 +03:00
Dmitry Kuzmenko
9309a83d21 Optionally keep auth list in token. 2017-03-22 11:49:33 +03:00
Nicole Thomas
8809d33674 Merge pull request #39701 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-02-28 12:50:10 -07:00
rallytime
b4366103a6 Merge branch '2016.11' into 'develop' 
Conflicts:
  - .pylintrc
  - .testing.pylintrc
  - salt/fileclient.py
  - salt/minion.py
  - salt/modules/docker.py
  - salt/modules/win_iis.py
  - salt/states/docker.py
  - salt/states/file.py
  - salt/utils/__init__.py
  - tests/integration/modules/test_sysmod.py
 2017-02-27 15:11:37 -07:00
Mike Place
cbd66a0d3f Merge pull request #39676 from F30/hash-comment 
Fix comments about the "hash_type" option
 2017-02-27 13:11:40 -07:00
Felix Dreissig
5371bc0996 Fix comments about the "hash_type" option 
Previous mentions of the correct default value (it really is sha256)
somehow got lost along the way.
Also, some comments seem to have gotten duplicated instead of updated.
 2017-02-26 23:24:54 +01:00
Felix Dreissig
78a185ab11 Fix comments about file backup directory 
The actual file state backup directory is called "file_backup" without a
trailing 's'.
 2017-02-26 22:49:29 +01:00
Mike Place
1dba2f9cb0
Add warning in docs 2017-02-22 11:44:38 -07:00
Erik Johnson
d35c2f810c salt.utils.gitfs: remove dulwich support, make refspecs configurable (#39210) 
* Add config params for custom refspecs

* Add exceptions for errors encountered modifying git config

* Make the refspecs a configurable parameter

* Make refspecs a per-remote parameter

* Update master config template to include custom refspecs opts

* Add documentation for new config params

* Update GitFS walkthrough with a section on custom refspecs

* Remove dulwich support from salt.utils.gitfs

Dulwich still lacks important features, including (but not limited to)
the following:

- Lack of the necessary support for checking out a ref needed for
  git_pillar/winrepo support

- No support in its config objects for multivar git config items, making
  it impossible to detect when repos have multiple refspecs set for a
  given git remote

Given this information, and the fact that it trails as a distant third
to Pygit2 and GitPython, Salt will cease to support Dulwich as a git
interface moving forward.

* Excise references to dulwich from documentation

* Add mention of custom refspecs to Nitrogen release notes

* Add gitfs_refspecs to mocked opts in gitfs integration tests

Also remove dulwich from unit tests

* Add information about opts argument not being intended for CLI use
 2017-02-09 09:50:45 -07:00
Erik Johnson
894f365090 Update master config template with pillar decryption args 2017-01-31 11:24:09 -06:00
rallytime
8928436bdd Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/pillar/__init__.py
 2017-01-30 09:06:27 -07:00
rallytime
fdaa5ac1b0 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/master.py
  - salt/pillar/__init__.py
  - salt/utils/__init__.py
 2017-01-26 14:09:37 -07:00
Erik Johnson
6b014e53fc Rename on_demand_pillar to on_demand_ext_pillar 2017-01-25 15:08:57 -06:00
Erik Johnson
d216f90c63 Document new on_demand_pillar option and add to config template 2017-01-25 14:43:14 -06:00
rallytime
49f57ba3f1 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/utils/win_functions.py
 2017-01-25 09:59:29 -07:00
Eric Radman
9b5d28df0c Extend support for pillarenv_from_saltenv to master config 
`pillarenv_from_saltenv` is already an option for minion config, this
change enables this feature on the master.

If set to `true` salt will derive the pillar environment set on the
master:

$ salt-run pillar.show_pillar saltenv=radman
my_passphrase:
    XYZ

$ sudo salt-run pillar.show_pillar saltenv=radman2
my_passphrase:
    ABC
 2017-01-19 13:34:33 -05:00
Bo Maryniuk
ffbd45062e Explain what it is about and how to configure that 2017-01-18 15:02:11 +01:00
rallytime
5b43a252c9 Merge branch '2016.11' into 'develop' 
Conflicts:
  - conf/master
  - doc/topics/installation/ubuntu.rst
  - salt/modules/pillar.py
  - salt/netapi/rest_tornado/saltnado.py
  - salt/states/influxdb_user.py
  - salt/utils/minions.py
  - salt/utils/openstack/nova.py
 2017-01-17 09:50:06 -07:00
rallytime
30e8a66fb0 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/netapi/rest_tornado/saltnado.py
  - tests/integration/netapi/rest_tornado/test_app.py
 2017-01-16 18:54:14 -07:00
rallytime
d24776f5e9 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - conf/master
  - doc/topics/netapi/index.rst
  - salt/netapi/__init__.py
 2017-01-15 16:07:55 -07:00
rallytime
b910499dbe Various follow up fixes 
Merge branch '2015.8.12_follow_up' into '2015.8'
 2017-01-13 14:40:17 -07:00
Bo Maryniuk
9b0a786aeb Explain what it is about and how to configure that 2017-01-06 15:29:25 -05:00
Mike Place
5b60b04195 Merge pull request #38596 from isbm/isbm-disable-custom-roster-for-api 
Disable custom roster for Salt API
 2017-01-05 16:20:01 -07:00
Bo Maryniuk
1bb92cc8a4 Explain what it is about and how to configure that 2017-01-05 22:38:52 +01:00
Erik Johnson
591b9ed9c4 Add pillarenv_from_saltenv to example minion config file 2016-12-25 11:36:40 -06:00
rallytime
a2927226ea Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/modules/all/salt.modules.napalm_route.rst
  - doc/ref/modules/all/salt.modules.napalm_snmp.rst
  - doc/ref/modules/all/salt.modules.napalm_users.rst
  - doc/ref/states/all/salt.states.netsnmp.rst
  - doc/ref/states/all/salt.states.netusers.rst
  - salt/states/cron.py
 2016-12-22 12:15:06 -07:00
rallytime
efb8a8ddf5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/config/__init__.py
  - salt/minion.py
 2016-12-22 10:39:14 -07:00
Mike Place
6ee7b2bae7 Merge pull request #38377 from DSRCorporation/features/consul_cache 
Implementation and docs for Consul key-value store plugin for minion data cache.
 2016-12-20 13:36:01 -07:00
Stefan Priebe
52fc6daac0 ZMQ: add an option for zmq.BACKLOG to salt master (zmq_backlog) 2016-12-20 09:55:31 -07:00
Dmitry Kuzmenko
dad748f57a Data cache plugin configuration documentation. 2016-12-20 19:32:48 +03:00
Mike Place
df462cbe3e Merge pull request #38212 from disaster123/develop_zmq_backlog 
ZMQ: add an option for zmq.BACKLOG to salt master (zmq_backlog)
 2016-12-20 07:41:42 -07:00
Mike Place
9350808fea Merge pull request #38361 from rallytime/deprecate-client_acl-client_acl_blacklist 
Remove support for client_acl and client_acl_blacklist
 2016-12-20 06:33:23 -07:00
rallytime
a9f85f0dbe Remove support for client_acl and client_acl_blacklist 
These have been deprecated for some time and were marked for
removal in Nitrogen.

publisher_acl and publisher_acl_blacklist should be used instead.
 2016-12-19 16:18:48 -07:00
rallytime
8f80916432 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/topics/cloud/index.rst
  - salt/states/cron.py
 2016-12-19 14:00:52 -07:00
David Boucha
11863a4bfe add examples of default minion returners 2016-12-19 13:47:40 -07:00
Stefan Priebe
15196c80be ZMQ: add an option for zmq.BACKLOG to salt master (zmq_backlog) 2016-12-19 19:30:47 +01:00
rallytime
5940db5b3f Merge branch '2016.3' into '2016.11' 
No conflict.
 2016-12-16 15:25:08 -07:00
rallytime
4a62d01577 Add docs for syndic_wait setting 
Fixes #38174
 2016-12-15 10:40:01 -07:00
rallytime
4998b8d116 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/peer.rst
  - doc/topics/reactor/index.rst
 2016-12-07 16:31:11 -07:00
rallytime
8fd53a4808 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/topics/cloud/vsphere.rst
  - salt/config/__init__.py
  - salt/daemons/masterapi.py
  - salt/templates/rh_ip/network.jinja
  - salt/utils/parsers.py
  - tests/unit/daemons_test.py
 2016-12-02 12:18:18 -07:00
Denys Havrysh
7d9bc9abce syndic_master: correct default value, documentation and example config 2016-11-30 17:18:44 +02:00
rallytime
62e3c44045 Switch proxy_merge_grains_in_module option default from False to True 2016-11-29 10:51:46 -07:00
rallytime
b3340c3a73 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/conf.py
  - salt/config/__init__.py
  - salt/minion.py
 2016-11-28 10:40:47 -07:00
Dmitry Kuzmenko
0c607ccaec An example configuration for TLS/SSL. (#37859) 2016-11-23 09:38:16 -07:00
Denys Havrysh
83d6a44254 Add ssh_log_file option to master config and documentation 2016-11-20 16:13:55 +02:00
Denys Havrysh
c8a0915460 Fix configuration example and documentation for syndic_log_file option 2016-11-19 13:11:36 +02:00
rallytime
e57fb947c6 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/status.py
 2016-11-01 12:56:04 -06:00
rallytime
6332da5c44 Prep release notes for 2016.11 2016-10-31 13:05:24 -06:00