valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
82,204 Commits 24 Branches 182 Tags 341 MiB
c2b5e50d50
Commit Graph

82204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Flavio Castelli
925cab88a0
First round of fixes 
Apply fixes requested inside of PR.

Signed-off-by: Flavio Castelli <fcastelli@suse.com>
 2017-06-21 20:56:21 +02:00
Flavio Castelli
1834f8695e
Introducing the kubernetes modules 
Allow basic interaction with kubernetes, right now only deployments
and services resources are managed.

Signed-off-by: Flavio Castelli <fcastelli@suse.com>
 2017-06-21 20:56:20 +02:00
Ch3LL
6f70dbd0e1 Add pycryptodome to crypt_test 2017-06-21 13:41:12 -04:00
Mike Place
a25818b90b Merge pull request #41872 from DSRCorporation/bugs/py3_DiskTestCase 
Py3: test_disk fix: don't expect dict iteration order will be the same
 2017-06-21 12:09:57 -05:00
Mike Place
eea9cafba0 Merge pull request #41874 from DSRCorporation/bugs/py3_mdadm_test 
Py3 mdadm test
 2017-06-21 12:03:33 -05:00
Mike Place
13df29ed9b Merge pull request #41877 from Ch3LL/fix_netstat_test 
Fix netstat and routes test
 2017-06-21 11:16:58 -05:00
Mike Place
66f8c83c93 Merge pull request #41566 from morganwillcock/certutil 
win_certutil: workaround for reading serial numbers with non-English languages
 2017-06-21 10:40:28 -05:00
Mike Place
ccd81ed047 Merge pull request #41859 from DSRCorporation/bugs/py3_tests_2017.7 
Py3 etcd unit test fix.
 2017-06-21 10:33:15 -05:00
Mike Place
4d0f5c433d Merge pull request #41679 from terminalmage/get-top-file-envs 
Prevent unnecessary duplicate pillar compilation
 2017-06-21 10:32:42 -05:00
Mike Place
278b5614d0 Merge pull request #41856 from meaksh/2017.7-suse-leftovers-part-two 
SUSE leftovers for 2017.7.0 RC
 2017-06-21 10:24:37 -05:00
Dmitry Kuzmenko
e1e8d96ef2 Removed unneeded import. 2017-06-21 18:08:44 +03:00
Ch3LL
d2076a6c93 Patch salt.utils.which for test_route test 2017-06-21 10:55:01 -04:00
Ch3LL
51f7e107dc Patch salt.utils.which for test_netstat test 2017-06-21 10:50:03 -04:00
Erik Johnson
a916e8da49 Improve normalization of saltenv/pillarenv usage for states 2017-06-21 08:49:34 -05:00
Erik Johnson
02f293a19c Update state unit tests to reflect recent changes 2017-06-21 08:19:05 -05:00
Erik Johnson
b7e5c11165 Don't compile pillar data when getting top file envs 
This prevents an unnecessary pillar compile when syncing custom types,
in cases where the saltenv is not specified.
 2017-06-21 08:19:05 -05:00
Erik Johnson
8d6fdb7c9a Don't compile pillar twice for salt-call 
This modifies the "state" exec module to use __pillar__ as the pillar
data for the state run rather than compiling fresh pillar, unless the
pillarenv has been changed from the configured value, keeping salt-call
from unnecessarily compiling pillar a second time.

It also normalizes saltenv/pillarenv support in functions that should
have had it but did not.
 2017-06-21 08:19:05 -05:00
Erik Johnson
d2abfbf4ed Add initial_pillar argument to salt.state 
This allows for salt.state.State() instances to have their initial
pillar data passed into them, rather than calling _gather_pillar() to
compile fresh pillar data. This allows for the __pillar__ dunder to be
used directly for salt-call (when the pillarenv is unchanged). Since the
__pillar__ is compiled at the beginning of a salt-call, this prevents
duplicate pillar rendering from happening when salt-call is invoked.
 2017-06-21 08:19:05 -05:00
Erik Johnson
70186de532 salt.pillar: rename the "pillar" argument to "pillar_override" 
This differentiates CLI pillar override with an eventual future
"initial_pillar" argument which will seed the Pillar class with initial
data.
 2017-06-21 08:19:01 -05:00
Dmitry Kuzmenko
1401b2d5ba Py3: mdadm test fix: don't expect kwargs iteration order 2017-06-21 15:45:55 +03:00
Dmitry Kuzmenko
127e48025a Py3: tests_disk fix: don't expect dict iteration order will be the same 2017-06-21 14:48:59 +03:00
Pablo Suárez Hernández
a3e9b5cdbe Fixes mocking error 2017-06-21 11:56:36 +01:00
Dmitry Kuzmenko
596ab0421d Py3: pass Exception to side effect friendly for both mock<1.1 and mock>=1.1 2017-06-21 12:46:46 +03:00
Pablo Suárez Hernández
6eea8179ad Pylint fixes 2017-06-21 10:09:11 +01:00
Pablo Suárez Hernández
686c45b8ab Fix buggy test 2017-06-21 09:32:01 +01:00
Mike Place
3c8dee0707 Merge pull request #41864 from garethgreenaway/2017_7_beacon_hotfix 
Quick fix for beacons in 2017.7
 2017-06-20 18:39:11 -05:00
Mike Place
955d5b710d Merge pull request #41865 from twangboy/fix_coverage_check 
Don't run coverage if not admin
 2017-06-20 18:38:54 -05:00
Morgan Willcock
c337d52d0c Fix test data for test_get_serial, and a typo 2017-06-21 00:26:47 +01:00
garethgreenaway
29b0acc3a2 Merge pull request #41853 from vutny/fix-master-schedule-event 
Fix master side scheduled jobs to return events
 2017-06-20 15:06:29 -07:00
twangboy
a2c4ff0ebc Don't run coverage it not admin 2017-06-20 15:32:55 -06:00
Morgan Willcock
7f6961378e test and lint fixes 2017-06-20 22:30:11 +01:00
Mike Place
afc61ffe63 Merge pull request #41861 from twangboy/fix_win_firewall 
Fix problems with get_rule and delete_rule
 2017-06-20 15:37:23 -05:00
Mike Place
eb0e40a867 Merge pull request #41014 from cachedout/issue_40937 
Ensure strings in decorator
 2017-06-20 15:36:00 -05:00
Gareth J. Greenaway
94ce954441 Reverting a change in 2017.7 that causes the beacons are expecting dictionaries as there configuration to no longer function. Fixing this for the nitrogen release, then addressing the original issue for Oxygen 2017-06-20 13:35:00 -07:00
Mike Place
60ea0ba85b Lint fix 2017-06-20 14:13:25 -06:00
Mike Place
4f8714037d Merge pull request #41851 from DSRCorporation/bugs/py3_tests_nitrogen 
Minor Py3 related tests fixes.
 2017-06-20 15:11:43 -05:00
Mike Place
938d4fddf1 Merge pull request #41787 from skizunov/develop3 
Fix #41778
 2017-06-20 15:11:22 -05:00
Mike Place
03b6ae5ea8 Merge pull request #41812 from skizunov/develop4 
TCP: Fix salt-master in bad state if remote side closed connection
 2017-06-20 14:46:53 -05:00
twangboy
78892074f5 Fix problems with get_rule and delete_rule 2017-06-20 12:48:46 -06:00
Dmitry Kuzmenko
c25ebe3a6e Py3: fix test for Py34. Fixed the etcd util error case handling. 2017-06-20 21:47:51 +03:00
Mike Place
cf2252bcea Merge pull request #41857 from dmurphy18/netstat_fix 
Modified support for deprecated netstat being removed by utilizing ss
 2017-06-20 13:46:27 -05:00
Mike Place
f04888d88f Remove unused import 2017-06-20 12:15:50 -06:00
garethgreenaway
12ec5f9f23 Merge pull request #41837 from rallytime/fix-40878 
Add fingerpint_hash_type option to ssh_auth state and related functions
 2017-06-20 11:14:52 -07:00
Sergey Kizunov
2ffd20cede Fix #41778 
An explanation of why this fixes #41778 (which appeared after merging
PR #41436).

The following is true both before PR #41436 was merged and after it
was merged:
- On Tornado 4.2.1, `SyncWrapper.__del__` is sometimes invoked twice.
  When this happens, `self.io_loop.close()` is also invoked twice.
- On Tornado 4.5.1, `SyncWrapper.__del__` is never invoked twice. Hence
  this issue doesn't appear when using that version of Tornado.

Why did PR #41436 cause this issue?
- What that PR essentially did was ensure that there were no pending
I/O operations left in the I/O Loop before the I/O Loop was closed.
It essentially "drained out" the pending future that came from
`self._read_until_future` which let `SaltMessageClient._stream_return()`
complete. Tornado 4.2.1 seems to allow a call to close an I/O Loop
twice if it still has pending operations, but will throw the
`ValueError` exception if you attempt to close an empty I/O Loop twice.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-06-20 12:40:59 -05:00
Mike Place
4140c639ae
Handle review comments 2017-06-20 11:30:57 -06:00
David Murphy
017fbdbc53 Modified support for deprecated netstat being removed by utilizing ss 2017-06-20 11:28:22 -06:00
Dmitry Kuzmenko
ea1a351f5f Code review fixup. 2017-06-20 20:26:58 +03:00
Mike Place
594b7631f7 Merge pull request #41850 from DSRCorporation/bugs/py3_tests_2017.7 
Py3 tests fix for 2017.7
 2017-06-20 12:17:28 -05:00
Mike Place
87a252fda7 Merge pull request #41852 from Ch3LL/rn_2017_py 
Update 2017 Release Notes with Python Messages
 2017-06-20 12:17:04 -05:00
Pablo Suárez Hernández
11568af6f5 Replace missing 'Oxygen' version tags to '2017.7.0' 2017-06-20 17:41:35 +01:00