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,417 Commits 24 Branches 182 Tags 341 MiB
8dbb93851d
Commit Graph

82417 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Pablo Suárez Hernández
30b12da58b Enables salt-minion watchdog on init.d script for sysV 2017-06-20 17:28:40 +01:00
Pablo Suárez Hernández
4257ba5af9 Adding salt-minion watchdog for sysV systems (rhel6 and sles11) 2017-06-20 17:28:40 +01:00
Michael Calmer
db295f6f06 special salt-minion.service file for rhel7 2017-06-20 17:28:39 +01:00
Michael Calmer
24bad5b078 translate variable arguments if they contain hidden keywords (bsc#1025896) 
- includes a test
 2017-06-20 17:28:39 +01:00
Bo Maryniuk
a27415c4cc Add YUM plugin 
* Add plugin for Yum-Salt integration
* Add configuration for the yumnotify plugin
* Fixes wrong 'enabled' opts for yumnotify plugin
 2017-06-20 17:28:39 +01:00
Silvio Moioli
22d884f478 Avoid failures on SLES 12 SP2 because of new systemd TaskMax limit (bsc#985112) 2017-06-20 17:28:39 +01:00
Michael Calmer
8c89378b0d Run salt-api as user salt (bsc#990029) 2017-06-20 17:28:38 +01:00
Bo Maryniuk
1c817bb6c9 Add zypp-notify plugin 
* Add unit test to the libzypp drift detector plugin
 2017-06-20 17:18:31 +01: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
Klaus Kämpf
02b6d8ce42 tserong@suse.com -- We don't have python-systemd, so notify can't work 2017-06-20 17:09:14 +01:00
Mike Place
c702bf6cb2 Merge pull request #41855 from cachedout/version_locale 
List locale in versions_report
 2017-06-20 10:44:52 -05:00
Mike Place
c3c0930a2d
List locale in versions_report 2017-06-20 09:43:47 -06:00
Mike Place
f720a849ba Merge pull request #41795 from isbm/isbm-suse-upstream-leftovers 
Things, that didn't made to 2017.7 for some reasons
 2017-06-20 09:28:21 -05:00
Denys Havrysh
e206c381c6 Fix master side scheduled jobs to return events 2017-06-20 17:21:35 +03:00
Dmitry Kuzmenko
44e2ad24df Don't fail if can't create a socket to check master connection. 
This happens for instance if ipv6 is disabled in the kernel but
/etc/hosts contains both ipv4 and ipv6 records for 'localhost'.
 2017-06-20 16:59:38 +03:00
Dmitry Kuzmenko
ea656e92c6 Py3: Disabled augeas test that segfaults the test suite. 
Because of a bug in python-augeas:
https://github.com/hercules-team/python-augeas/issues/30
 2017-06-20 16:59:38 +03:00
Dmitry Kuzmenko
5a1bdd368e Py3: minor tests updates 
Correct skipping explanation and correctly disable by proper conditions.
BTW, mysql works on Py3. There's a port of python-mysql and test passes.
 2017-06-20 16:59:38 +03:00
Dmitry Kuzmenko
2cff18e2ef Py3: fix boto elb test 2017-06-20 16:59:38 +03:00
Ch3LL
75f93edff2 Update 2017 Release Notes with Python Messages 2017-06-20 09:55:13 -04:00
Dmitry Kuzmenko
9de940d3d3 Py3: don't use mock.assert_called_once implemented in 3.6. 2017-06-20 16:34:22 +03:00
Dmitry Kuzmenko
e079b4657a Py3: PyDSL test fix. Ignore kwargs order. 2017-06-20 14:29:00 +03:00
Bo Maryniuk
3357dd6f22 Replace 'Nitrogen' as '2017.7.0' version 2017-06-20 11:11:10 +02:00
Mike Place
e7fc30f482 Merge pull request #41839 from cro/extend_proxy_to_jinja 
Extend proxy to jinja
 2017-06-19 18:03:00 -05:00
Mike Place
a4195f5246 Merge pull request #41841 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-06-19 18:01:11 -05:00
Mike Place
58387b127a Merge pull request #41786 from whiteinge/runner-arg-parsing-regressions 
Runner arg parsing regressions
 2017-06-19 18:00:06 -05:00
Bo Maryniuk
7ca1ab5f03 Merge branch 'isbm-suse-upstream-leftovers' of github.com:isbm/salt into isbm-suse-upstream-leftovers 2017-06-20 00:26:35 +02:00
Bo Maryniuk
904d40d0bd Removing 'Oxygen' from the docstring 2017-06-20 00:23:50 +02:00
Mike Place
f1def17e8e Merge pull request #41836 from DSRCorporation/bugs/py3_disable_pytest_log_handler 
Temporary POC: disable runtests log handler for Py3 tests.
 2017-06-19 17:21:42 -05:00
Mike Place
01bf537203 Merge pull request #41834 from cro/ldapgroupclassdoc 
Clarify some LDAP issues driven by #38259 and #38293
 2017-06-19 16:47:08 -05:00
Mike Place
8f81b9a9a9 Merge pull request #41708 from rallytime/module_run_deprecation 
Bump deprecation version to Sodium, update docs for module state
 2017-06-19 16:45:33 -05:00
Mike Place
6a07df31fc Merge pull request #41835 from rallytime/remove-warning 
Remove warning about default hash type
 2017-06-19 15:32:54 -05: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
C. R. Oldham
16a05a5554 Fix backticks and dropped clause. 2017-06-19 14:03:34 -06:00
Nicole Thomas
c84a6f36f4 Merge pull request #41808 from gtmanfred/py3 
Fix last of the failing mac/py3 tests
 2017-06-19 13:57:32 -06:00
C. R. Oldham
172d3520ea Merge branch 'extend_proxy_to_jinja' of github.com:cro/salt into extend_proxy_to_jinja 2017-06-19 13:55:49 -06:00
C. R. Oldham
2ffad2af35 Extend __proxy__ to jinja as proxy (like __salt__->salt) 2017-06-19 13:55:20 -06:00
rallytime
48ff5d2a62 Add fingerpint_hash_type option to ssh_auth state and related functions 
In PR #40543, the fingerprint_hash_type option was added to the state
function in salt/states/ssh_known_hosts.py, as well as the function in
the ssh execution module that the ssh_known_hosts states called out to.

This caused issue #40878 because the fingerprint_hash_type state setting
was not added to the salt/states/ssh_auth.py file. This PR adds this
setting to the ssh_auth file, as well as the functions that are used in
the ssh execution module. This allows the user to set the fingerprint_hash_type
option so avoid the warnings about the default changing.

Fixes #40878
 2017-06-19 13:31:11 -06:00
rallytime
987a18eb0e Remove warning about default hash type 
This is no longer needed in the 2017.7 branch as the default
has changed.
 2017-06-19 13:27:11 -06:00