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
43,656 Commits 24 Branches 182 Tags 341 MiB
b721203ed1
Commit Graph

43656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Galet
782f6118cc Fix ini_manage state - equality detection for non-string values 2014-12-16 18:45:14 +01:00
Thomas S Hatch
31d7c6f57b Merge pull request #18996 from garethgreenaway/18969_2014_7_schedule_list 
schedule.list should return an empty dictionary, not None
 2014-12-16 10:19:25 -07:00
Thomas Jackson
a86c2e8b5a Pylint cleanup 2014-12-16 07:44:18 -08:00
Thomas Jackson
44f1448d01 Remove "init_timeout" in RemoteFileClient.get_file 
This timeout seems to attempt to retry in the event that the master returns nothing-- but the channel should be responsible for that.

In addition this would retry infinitely since the retry counter was re-initialized on every loop iteration. This meant you spun with an strace that looks something like:

```
read(12, "e\351\r\6y\357\331\313a0\233t\256\16qP", 16) = 16
close(12)                               = 0
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(8, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 60000) = 1 ([{fd=10, revents=POLLIN}])
poll([{fd=10, events=POLLIN}], 1, 0)    = 1 ([{fd=10, revents=POLLIN}])
read(10, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(1, "('foo here', 'top.sls')\n", 24) = 24
select(0, NULL, NULL, NULL, {0, 20000}) = 0 (Timeout)
open("/dev/urandom", O_RDONLY)          = 12
read(12, "\207L\210\340\314\203\353\207\236\231B{\304$\320\227", 16) = 16
close(12)                               = 0
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(8, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 60000) = 1 ([{fd=10, revents=POLLIN}])
poll([{fd=10, events=POLLIN}], 1, 0)    = 1 ([{fd=10, revents=POLLIN}])
read(10, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(1, "('foo here', 'top.sls')\n", 24) = 24
select(0, NULL, NULL, NULL, {0, 20000}) = 0 (Timeout)
open("/dev/urandom", O_RDONLY)          = 12
read(12, "\3\253\250\326w~\325\277\306\233'\355\300\225\202=", 16) = 16
close(12)                               = 0
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(8, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 60000) = 1 ([{fd=10, revents=POLLIN}])
poll([{fd=10, events=POLLIN}], 1, 0)    = 1 ([{fd=10, revents=POLLIN}])
read(10, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(1, "('foo here', 'top.sls')\n", 24) = 24
select(0, NULL, NULL, NULL, {0, 20000}) = 0 (Timeout)
open("/dev/urandom", O_RDONLY)          = 12
read(12, "\250\371\205\375\310\257\30\254\376\261\250o\177\357C6", 16) = 16
close(12)                               = 0
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(8, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 60000) = 1 ([{fd=10, revents=POLLIN}])
poll([{fd=10, events=POLLIN}], 1, 0)    = 1 ([{fd=10, revents=POLLIN}])
read(10, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(1, "('foo here', 'top.sls')\n", 24) = 24
select(0, NULL, NULL, NULL, {0, 20000}) = 0 (Timeout)
open("/dev/urandom", O_RDONLY)          = 12
read(12, "\322\0276\\\231\214v\5@pp\36\211\277\360\207", 16) = 16
close(12)                               = 0
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(8, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 60000) = 1 ([{fd=10, revents=POLLIN}])
poll([{fd=10, events=POLLIN}], 1, 0)    = 1 ([{fd=10, revents=POLLIN}])
read(10, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout
```

Lastly, this retry attempt counter did nothing in the event of 10 failures (assuming it could get one) so it should be safe to remove it all together

Conflicts:
	salt/fileclient.py
 2014-12-16 07:44:09 -08:00
C. R. Oldham
10b1fd87e8 Merge pull request #19006 from cro/walkpath 
Fix typo in os.walk
 2014-12-16 08:21:40 -07:00
Rupesh Tare
64517b5449 Merge branch 'develop' into at_unit_tests 2014-12-16 19:50:03 +05:30
Rupesh Tare
8d271b173d added test cases for at and atc function from at module 2014-12-16 19:48:30 +05:30
Nitin Madhok
ead0c5184b Adding ability to do a test run with test=True. #18966 2014-12-16 05:02:37 -05:00
Thomas Jackson
8881430522 Pylint cleanup 2014-12-15 19:29:28 -08:00
Thomas Jackson
11a951985b Remove "init_timeout" in RemoteFileClient.get_file 
This timeout seems to attempt to retry in the event that the master returns nothing-- but the channel should be responsible for that.

In addition this would retry infinitely since the retry counter was re-initialized on every loop iteration. This meant you spun with an strace that looks something like:

```
read(12, "e\351\r\6y\357\331\313a0\233t\256\16qP", 16) = 16
close(12)                               = 0
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(8, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 60000) = 1 ([{fd=10, revents=POLLIN}])
poll([{fd=10, events=POLLIN}], 1, 0)    = 1 ([{fd=10, revents=POLLIN}])
read(10, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(1, "('foo here', 'top.sls')\n", 24) = 24
select(0, NULL, NULL, NULL, {0, 20000}) = 0 (Timeout)
open("/dev/urandom", O_RDONLY)          = 12
read(12, "\207L\210\340\314\203\353\207\236\231B{\304$\320\227", 16) = 16
close(12)                               = 0
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(8, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 60000) = 1 ([{fd=10, revents=POLLIN}])
poll([{fd=10, events=POLLIN}], 1, 0)    = 1 ([{fd=10, revents=POLLIN}])
read(10, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(1, "('foo here', 'top.sls')\n", 24) = 24
select(0, NULL, NULL, NULL, {0, 20000}) = 0 (Timeout)
open("/dev/urandom", O_RDONLY)          = 12
read(12, "\3\253\250\326w~\325\277\306\233'\355\300\225\202=", 16) = 16
close(12)                               = 0
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(8, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 60000) = 1 ([{fd=10, revents=POLLIN}])
poll([{fd=10, events=POLLIN}], 1, 0)    = 1 ([{fd=10, revents=POLLIN}])
read(10, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(1, "('foo here', 'top.sls')\n", 24) = 24
select(0, NULL, NULL, NULL, {0, 20000}) = 0 (Timeout)
open("/dev/urandom", O_RDONLY)          = 12
read(12, "\250\371\205\375\310\257\30\254\376\261\250o\177\357C6", 16) = 16
close(12)                               = 0
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(8, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 60000) = 1 ([{fd=10, revents=POLLIN}])
poll([{fd=10, events=POLLIN}], 1, 0)    = 1 ([{fd=10, revents=POLLIN}])
read(10, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(1, "('foo here', 'top.sls')\n", 24) = 24
select(0, NULL, NULL, NULL, {0, 20000}) = 0 (Timeout)
open("/dev/urandom", O_RDONLY)          = 12
read(12, "\322\0276\\\231\214v\5@pp\36\211\277\360\207", 16) = 16
close(12)                               = 0
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
write(8, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout)
poll([{fd=10, events=POLLIN}], 1, 60000) = 1 ([{fd=10, revents=POLLIN}])
poll([{fd=10, events=POLLIN}], 1, 0)    = 1 ([{fd=10, revents=POLLIN}])
read(10, "\1\0\0\0\0\0\0\0", 8)         = 8
poll([{fd=10, events=POLLIN}], 1, 0)    = 0 (Timeout
```

Lastly, this retry attempt counter did nothing in the event of 10 failures (assuming it could get one) so it should be safe to remove it all together
 2014-12-15 19:15:17 -08:00
Thomas Jackson
eb157c06e0 Cleanup fileclient's references to channel 
we don't need an attribute *and* a getter
 2014-12-15 19:13:14 -08:00
C. R. Oldham
79b9198402 Merge pull request #19009 from rallytime/dont_quote_ints 
Fix mac_user.py module --> Don't quote integers like uid and gid
 2014-12-15 17:27:29 -07:00
rallytime
44e60acd12 Fix mac_user.py module --> Don't quote integers like uid and gid 2014-12-15 16:45:01 -07:00
Tim O'Guin
1b40981bfb fix pylist errors for tomcat module 2014-12-15 17:19:31 -06:00
Tim O'Guin
606cef93fa make pillar configuration for tomcat module backwards compatible with 2014.1 and update docs 2014-12-15 17:19:20 -06:00
Colton Myers
69337284ef Merge pull request #19000 from jfindlay/split_state 
split win commands in state
 2014-12-15 15:47:27 -07:00
C. R. Oldham
22cd943e5c Fix typo in os.walk 2014-12-15 15:29:27 -07:00
Thomas Jackson
22019ba773 Pylint cleanup 2014-12-15 13:52:38 -08:00
Thomas Jackson
036462592a Fix backtraces from runner/wheel modules 2014-12-15 13:49:19 -08:00
Thomas Jackson
de3354d136 Add debug line to threadpool executor 2014-12-15 13:49:06 -08:00
Steve Weber
cafd99f257 include wol in network module 
include wol in network module.
 2014-12-15 16:31:44 -05:00
German Jaber
69e1d22c2a Added support for a pkgs argument to the pip state 
- The pip state has been modified to allow a pkgs argument
- It receives a list of packages to install
- Version specification must be enclosed by quotes
- If pkgs is specified, name is ignored
- If requirements or editable is specified, pkgs is ignored
 2014-12-15 16:00:19 -04:30
Mike Place
10c5812646 Fix missing update to daemons refactor 2014-12-15 13:17:29 -07:00
Mike Place
67150306b6 Fix version test 2014-12-15 13:13:42 -07:00
Justin Findlay
4c47b13e48 split win commands in state 2014-12-15 13:10:52 -07:00
Pedro Algarvio
a6b5011cb7 Typo 2014-12-15 19:28:26 +00:00
Thomas S Hatch
c2a50ec4d3 Merge pull request #18978 from garethgreenaway/nfs_requires_remount_options_changed 
fixes to mount for nfs share
 2014-12-15 12:24:50 -07:00
Mike Place
19dc114f81 Weird pylint 2014-12-15 12:22:35 -07:00
Thomas S Hatch
7c471ef13f Merge pull request #18990 from toanju/patch-1 
debian vlan configuration
 2014-12-15 12:20:30 -07:00
Mike Place
302d5cab39 Fix failing test 2014-12-15 12:04:35 -07:00
Gareth J. Greenaway
67c08f4151 schedule.list should return an empty dictionary, not None 2014-12-15 10:40:39 -08:00
Mike Place
a8ab27df4c Make tests run 2014-12-15 11:36:19 -07:00
Mike Place
5d81614cd5 Restore warnings 2014-12-15 11:36:19 -07:00
Mike Place
548fa62e1c Fix bad import syntax 2014-12-15 11:36:19 -07:00
Mike Place
6b866b187d Oopslint 2014-12-15 11:36:19 -07:00
Mike Place
ca07f1efb1 More lint 2014-12-15 11:36:19 -07:00
Mike Place
07ccc0ec94 Lint 2014-12-15 11:36:19 -07:00
Mike Place
e81f1bfb2f Fixup 2014-12-15 11:36:19 -07:00
Mike Place
da608ef3bc Late-load batch 2014-12-15 11:36:19 -07:00
Mike Place
f07e58b8f4 Refactor salt/__init__ into cli/daemons and late-load outputters 
If we late-load the outputter, we can get to the pub slightly faster
 2014-12-15 11:36:17 -07:00
Mike Place
a3e667f458 Refactor the entire CLI out of __init__ 2014-12-15 11:35:41 -07:00
Gareth J. Greenaway
1d33faed4b Rebasing to fix the merge conflict 2014-12-15 10:18:02 -08:00
Thomas S Hatch
403f1404e4 Merge pull request #18956 from thatch45/merge_forward_8798 
Merge forward 2014.7
 2014-12-15 10:38:36 -07:00
Thomas S Hatch
59f8a2bbe7 Merge pull request #18993 from rasathus/develop 
Logs exceptions while caching for s3fs fileserver. Messages such as 'Acc...
 2014-12-15 10:27:20 -07:00
Thomas S Hatch
d5ba92bcd6 Merge pull request #18988 from rallytime/zypper_list_not_tuple 
Use lists instead of tuples in modules/zypper.py
 2014-12-15 10:19:05 -07:00
Thomas S Hatch
4a986632b8 Merge pull request #18976 from techhipster/windows-detect-openstack 
Detect a Windows VM on OpenStack and populate the 'virtual' grain
 2014-12-15 10:15:31 -07:00
Thomas S Hatch
2ec2ec6e1b Merge pull request #18974 from garethgreenaway/gpg_module_hardcoded_path 
Fixes to gpg module
 2014-12-15 10:09:51 -07:00
Thomas S Hatch
34ed8b0f8b Merge pull request #18972 from garethgreenaway/18874_2014_7_mount_fixes 
Fixes to mount module
 2014-12-15 10:09:29 -07:00
Thomas S Hatch
3b89cff0d7 Merge pull request #18971 from whiteinge/doc-formula-style-guide 
Fixes and additions to the Formula best practices doc
 2014-12-15 10:08:49 -07:00
Thomas S Hatch
3b780e0ccd Merge pull request #18968 from s0undt3ch/hotfix/issue-18877-hardcoded-path 
The `gpgkeys` path should use `salt.syspaths`
 2014-12-15 09:59:57 -07:00