Commit Graph

43447 Commits

Author SHA1 Message Date
Joseph Hall
bc58c569ab Update docs for impacket dep 2014-12-17 11:45:49 -07:00
Joseph Hall
0154515873 Switch from smbclient to impacket 2014-12-17 11:40:26 -07:00
C. R. Oldham
93f76faaf6 Merge pull request #19045 from techhat/smbutil
Adding initial utils lib for SMB
2014-12-17 09:46:05 -07:00
Joseph Hall
85fc273521 Linting 2014-12-17 08:59:26 -07:00
Joseph Hall
5b30c15cf7 Wrap impacket.smbconnection.putFile() 2014-12-17 08:36:05 -07:00
Joseph Hall
efa011dbaa Adding initial utils lib for SMB 2014-12-16 21:00:35 -07:00
Mike Place
71bba6c676 Merge pull request #19039 from cachedout/progess_docs
Add docs to progress outputter
2014-12-16 17:37:47 -07:00
Mike Place
2d38be6952 Add docs to progress outputter 2014-12-16 17:34:05 -07:00
Thomas S Hatch
9b76717646 Merge pull request #19036 from basepi/lithium-saltssh-release
Add salt-ssh publish wrapper to lithium release notes
2014-12-16 16:49:17 -07:00
Colton Myers
e0b6f1623c Add publish wrapper to lithium release notes 2014-12-16 16:13:03 -07:00
Thomas S Hatch
215a4d0e89 Merge pull request #19027 from cvrebert/patch-1
utils/__init__.py: rm redundant import
2014-12-16 14:00:15 -07:00
Chris Rebert
eb72efd0c0 utils/__init__.py: rm redundant import
************* Module salt.utils
salt/utils/__init__.py💯 [W0404(reimported), ] Reimport 'salt.defaults.exitcodes' (imported line 97)
2014-12-16 11:55:31 -08:00
Thomas S Hatch
a5c61bf39b Merge pull request #19012 from jacksontj/develop
Fix infinites spinning in minion RemoteFileClient
2014-12-16 12:34:12 -07: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
Thomas S Hatch
7c471ef13f Merge pull request #18990 from toanju/patch-1
debian vlan configuration
2014-12-15 12:20:30 -07: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
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
9e8f498431 Merge pull request #18964 from DSRCompany/raet_presence
Presence support with raet
2014-12-15 09:45:38 -07:00
Gareth J. Greenaway
397b471f8e removing duplication assignment. Syncing up the path with the gpg renderer. 2014-12-15 07:55:56 -08:00
Nicole Thomas
2decd9de47 Merge pull request #18954 from rupeshta/at_unit_tests
created unit test case for function atq from module at
2014-12-15 08:55:18 -07:00
Chris Fane
7be9ac7bf5 Logs exceptions while caching for s3fs fileserver. Messages such as 'AccessDenied' will now be logged as at warning level. fixes #18992 2014-12-15 15:05:07 +00:00
Rupesh Tare
54bb776f9e Merge branch 'develop' into at_unit_tests 2014-12-15 17:29:54 +05:30
Rupesh Tare
fbafd6fb51 added unit test case for atrm & jobcheck functions from at module 2014-12-15 17:28:58 +05:30
Tobias Jungel
f9cb8883cb debian vlan configuration
Debian based systems depend on the package 'vlan' to enable a VLAN interface
2014-12-15 10:05:45 +01:00
Dmitry Kuzmenko
4e91495075 Minor: fixed formatting 2014-12-15 10:27:06 +03:00
Dmitry Kuzmenko
5b48d3a38d Support subset and show_ipv4 flags in presence runners
Use availables as a base for present results
Send host address together with the host name in presence responce
Support subset and show_ipv4 flags in presence runners
Fixed not_present subset:
  Old: include alive minions not included into subset to resutls
  New: show only not-alive minions specified in the subset
Moved key directory names to a static fields to key classes. So fixed
some wrong cases in raet key behavior like using 0MQ specific names and
handle denied state absence.
2014-12-15 08:32:53 +03:00
Dmitry Kuzmenko
2b7cdc6326 Minor. Removed unneeded logging 2014-12-15 08:32:53 +03:00
Dmitry Kuzmenko
40c8728b50 Implemented presence events firing and presence request support. 2014-12-15 08:32:53 +03:00
Joseph Hall
91b963274a Merge pull request #18975 from s0undt3ch/hotfix/sysrc-virtual-fix
The return value of `__virtual__` should never be `None`
2014-12-13 07:18:39 -07:00
Pedro Algarvio
d301d8c25e The return value of __virtual__ should never be None 2014-12-13 09:38:15 +00:00
Gareth J. Greenaway
e39557b2a9 Fixing the path that the gpg module uses if the user is salt to be pulled from salt.syspaths. Similar fix to #18968 2014-12-12 20:55:12 -08:00
Nicole Thomas
4b3135ba54 Merge pull request #18970 from s0undt3ch/hotfix/skip-if-no-sshd-server-running
Skip tests which require the SSHD server running in case it's not
2014-12-12 19:39:17 -07:00
Pedro Algarvio
71df7ac58a Skip tests which require the SSHD server running in case it's not 2014-12-13 00:11:41 +00:00
Thomas S Hatch
1a766af93c Merge pull request #18959 from thatch45/zipfile_shadow
fix zip_file shadowing per #18933
2014-12-12 14:28:05 -07:00
Joseph Hall
fcf7df3704 Merge pull request #18962 from jacksontj/develop
Docs cleanup
2014-12-12 12:49:51 -07:00
Thomas Jackson
4d41fa35a1 Comma cleanup 2014-12-12 11:40:36 -08:00
Thomas Jackson
2bd05998b3 Comma cleanup 2014-12-12 11:40:10 -08:00
Thomas Jackson
2fa6dad350 Comma cleanup 2014-12-12 11:39:55 -08:00
Thomas Jackson
fb7e5630d8 Comma cleanup 2014-12-12 11:39:40 -08:00
Thomas Jackson
f0aae727ce Comma cleanup 2014-12-12 11:39:07 -08:00
Thomas Jackson
d5d0a35297 Comma cleanup 2014-12-12 11:38:50 -08:00
Thomas Jackson
57933e9148 Comma cleanup 2014-12-12 11:38:18 -08:00
Thomas Jackson
85864eca4a Comma cleanup 2014-12-12 11:37:59 -08:00
Thomas Jackson
7da2bbc457 fix usage of e.g (no comma) 2014-12-12 11:37:48 -08:00
Thomas Jackson
8df54973c3 Comma cleanup 2014-12-12 11:34:51 -08:00
Thomas Jackson
da3ea213e9 Comma cleanup 2014-12-12 11:34:34 -08:00
Thomas Jackson
23674c100d Comma cleanup 2014-12-12 11:33:14 -08:00