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
61,007 Commits 24 Branches 182 Tags 341 MiB
cb92114377
Commit Graph

61007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
cb92114377 Add syndic_id param for API compatibility 
Also fix successive updates
 2016-03-05 01:02:31 -06:00
Erik Johnson
1d39eec69b Skip events with minion lists but no jid 
Some events just contain a timestamp and a minion list, but no jid.
These can safely be ignored, lest they cause supurious log messages.

Also, pass the syndic's id so that it can be stored in a unique file in
the job cache (in the local_cache returner).
 2016-03-05 01:01:25 -06:00
Erik Johnson
651e3926f7 lint fixes 2016-03-04 10:59:45 -06:00
Erik Johnson
0f175a4edf salt.returners.sqlite3_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
f8664103b1 salt.returners.redis_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
0ea1b76c22 salt.returners.postgres_local_cache: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
d6d794b484 salt.returners.postgres: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
82750ab699 salt.returners.pgjsonb: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
d8f90f6578 salt.returners.odbc: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
a1957c3706 salt.returners.mysql: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
ef6aa5de1c salt.returners.multi_returner: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
5b4eb58d99 salt.returners.mongo_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
da1acbb8f2 salt.returners.mongo_future_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
c13bb6549c salt.returners.memcache_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
4322ad9ef3 salt.returners.influxdb_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
1dd106183c salt.returners.etcd_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
8e80535516 salt.returners.couchdb_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
44538dfced salt.returners.cassandra_cql_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
084a78407a salt.returners.couchbase_return: move minion list updates to new save_minions() func 2016-03-03 21:40:36 -06:00
Erik Johnson
f731dc5d32 Update a job's minion list to include minion lists forwarded by syndic 
This allows the job cache to include minions matched by lower-level
masters for a given job.
 2016-03-03 21:40:36 -06:00
Erik Johnson
504f7df460 Add utils function to invoke a returner's save_minions() func 2016-03-03 21:40:36 -06:00
Erik Johnson
0b4616a3eb Separate writing of serialized minion list into its own function 
This allows minions to be updated when the master receives events
containing lists of minions targeted by lower-level masters.
 2016-03-03 21:40:36 -06:00
Erik Johnson
214fedc3f6 Simplify jobs.get_jobs logic, generally improve jobs runner docs 2016-03-03 21:40:36 -06:00
Erik Johnson
3f527be748 Add an exception class for errors encountered while locking files. 2016-03-03 21:40:36 -06:00
Erik Johnson
1e6b43eef8 Add a contextmanager for file locking 2016-03-03 21:40:36 -06:00
Erik Johnson
978b6cb32f Add missing RST file for slsutil module 2016-03-03 21:40:36 -06:00
Erik Johnson
2ad8ceffc2 Add salt.utils.split_input() 2016-03-03 21:40:35 -06:00
Mike Place
2ed7286af1 Merge pull request #31653 from DSRCompany/issues/29753_multimaster_auth_fail 
Don't attempt to verify token if it wasn't sent to master.
 2016-03-03 10:39:34 -07:00
Mike Place
118fcde425 Merge pull request #31629 from darix/fix-services-on-sles 
Fix services on sles
 2016-03-03 09:41:27 -07:00
Mike Place
4d1701de60 Merge pull request #31641 from rallytime/testing-tutorial 
Improve Salt Testing tutorial to be a more comprehensive intro
 2016-03-03 09:08:47 -07:00
Mike Place
584f8401b8 Merge pull request #31651 from dr4Ke/test_case_for_30689 
test case: test_list_present_nested_already
 2016-03-03 09:02:55 -07:00
Dmitry Kuzmenko
2557707cc7 Don't attempt to verify token if it wasn't sent to master. 
In multimaster setup new minion having no master pubkey sends initial
auth requests to each master without token but it tries to verify the
token in the received payload for each master excluding the first.
This happens because minion makes this decision depending on the master
pubkey file existense.
 2016-03-03 17:36:37 +03:00
C. R. Oldham
5566f1f2a7 Merge pull request #31643 from Unity-Technologies/hotfix/hg-fix-repo-updated 
Make sure we are really updating the mercurial repository
 2016-03-03 07:30:53 -07:00
Christophe Drevet-Droguet
fc9dd356e8 test case: test_list_present_nested_already 2016-03-03 15:17:43 +01:00
Daniel Hobley
ca41c4b8c1 Make sure we are really updating the mercurial repository 
This fixes a bug where if you have any changes pushed to a mercurial repo no matter which revision you specify the state will claim the repository is updated. This also correctly detects when you switch from one branch to another in mercurial even if there are no new changes being pulled.
 2016-03-03 08:48:00 +01:00
rallytime
6ab3961748 Improve Salt Testing tutorial to be a more comprehensive intro 2016-03-02 17:07:57 -07:00
Mike Place
36c790eede Merge pull request #31598 from terminalmage/issue30761 
Remove limitations on validation types for eauth targets
 2016-03-02 15:14:41 -07:00
Mike Place
cc4c31cf7f Merge pull request #31627 from jakehilton/2015.8 
Handling error from using gevent 1.1.
 2016-03-02 15:01:22 -07:00
Nicole Thomas
191241e71a Merge pull request #31630 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-03-02 13:49:51 -07:00
rallytime
75bb692990 Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-03-02 12:33:10 -07:00
Marcus Rückert
9b8d6cbb72 make the suse check consistent with rh_service.py 2016-03-02 20:17:37 +01:00
Marcus Rückert
c0c8a77242 Fix numerical check of osrelease 
After making the version check numerical in 9975508 it no longer matched
SLES 11 properly to use the rh_service module as '11.4 > 11' evaluates
to true. Without using the rh_service module, not all methods are
implemented to use the service state on sle11.
 2016-03-02 20:16:26 +01:00
Jake Hilton
02fb5ed616 Handling error from using gevent 1.1. 2016-03-02 12:11:38 -07:00
Nicole Thomas
6d31b8918f Merge pull request #31622 from jfindlay/query_doc 
doc/topics/tutorials/http: update query decoding docs
 2016-03-02 11:23:44 -07:00
Justin Findlay
4e48fec806 doc/topics/tutorials/http: update query decoding docs 
Fixes #31614.
 2016-03-02 10:17:22 -07:00
Nicole Thomas
38ddd62aef Merge pull request #31594 from rallytime/bp-31589 
Back-port #31589 to 2015.8
 2016-03-02 09:33:24 -07:00
C. R. Oldham
86a0fc46b4 Merge pull request #31604 from joejulian/2015.8_31596_workaround_no_xml_when_not_tty 
Workaround for non-xml output from gluster cli when not tty
 2016-03-02 08:53:44 -07:00
Nicole Thomas
36ce240596 Merge pull request #31583 from vutny/remove-trailing-white-spaces 
Remove trailing white spaces
 2016-03-02 08:38:01 -07:00
Denys Havrysh
bbcad93a8d Fix trailing white spaces in Salt PRM spec file 2016-03-02 10:42:00 +02:00
Denys Havrysh
86433f2378 Revert changes in files used by roots_test.py integration test 2016-03-02 10:00:45 +02:00