valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
37,299 Commits 24 Branches 182 Tags 341 MiB
3493cfae7e
Commit Graph

37299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
3493cfae7e Replaced by pylint check. 2014-12-18 13:01:51 -07:00
Thomas S Hatch
f69575b65d Merge pull request #19088 from terminalmage/fix-update_lxc_conf 
Fix regression in lxc.update_lxc_conf
 2014-12-18 09:48:46 -07:00
Thomas S Hatch
34def7d81e Merge pull request #19086 from rallytime/bp-19014 
Backport #19014 to 2014.7
 2014-12-18 09:48:09 -07:00
Thomas S Hatch
716e45646d Merge pull request #19065 from basepi/salt-ssh-tty-16847 
Fix salt-ssh with sudo and tty enabled
 2014-12-18 09:35:36 -07:00
Thomas S Hatch
f25f92dd18 Merge pull request #19047 from eliasp/2014.7-modules.file.replace-test-coverage 
2014.7 file.replace integration test coverage
 2014-12-18 09:33:34 -07:00
Erik Johnson
984fd744e8 Fix regression in lxc.update_lxc_conf 
This regression snuck in after the 2014.7.0 release, in d447cead. Fixing
this ahead of the 2014.7.1 release.
 2014-12-18 09:15:23 -06:00
Nitin Madhok
d585771ff0 Adding ability to do a test run with test=True. #18966 2014-12-18 08:08:52 -07:00
C. R. Oldham
8e184b372d Merge pull request #19082 from Lendar/fix-schedule-examples 
Fix states.schedule examples
 2014-12-18 07:13:48 -07:00
Lendar
14fa721256 Fix states.schedule examples 2014-12-18 14:24:17 +03:00
Elias Probst
e702c79817 Pylint. 2014-12-18 02:22:11 +01:00
Elias Probst
5a6811759f Fix tests for #18841. 2014-12-18 01:51:26 +01:00
Elias Probst
a2e52dd5fc Fix tests for #18841. 2014-12-18 01:51:08 +01:00
Elias Probst
e82c6ba7c0 Add missing line. 2014-12-18 01:50:39 +01:00
Elias Probst
24d6a6afd8 Simplify initial search. Determine 'backup' properly. 2014-12-18 01:48:53 +01:00
Colton Myers
228b2b6cd4 Discard stderr for salt-ssh with tty 
Because we're using a tty, we only get a combined stdout and stderr. So
we throw away the stderr from our salt command and we don't worry about
the lack of an RSTR in the stderr on the master side
 2014-12-17 15:08:55 -07:00
Colton Myers
937b805ae6 Don't use -t -t for scp commands when tty enabled in salt-ssh 2014-12-17 15:08:17 -07:00
Thomas S Hatch
ca1d2fa17a Merge pull request #19062 from terminalmage/issue19055 
Fix traceback for non-string values in lxc config files
 2014-12-17 14:58:58 -07:00
Thomas S Hatch
6dd3c6e0a1 Merge pull request #19042 from JaseFace/aptpkg-uninstall-env-vars 
The aptpkg uninstall operation needs to inherit DPKG_ENV_VARS set above as install and upgrade currently do.
 2014-12-17 14:53:27 -07:00
Thomas S Hatch
c362592044 Merge pull request #19040 from whiteinge/salt-log-granular-example 
Updates to the logging docs in the example conf files
 2014-12-17 14:52:35 -07:00
Thomas S Hatch
60f1e368bc Merge pull request #19008 from juiceinc/bugfix/tomcat-pillar 
Backwards compatibility for Tomcat module Pillar configuration
 2014-12-17 14:41:52 -07:00
Thomas S Hatch
a261e5bb31 Merge pull request #19004 from jacksontj/2014.7 
Fix for new threaded reactor
 2014-12-17 14:39:57 -07:00
Joseph Hall
b347e7706b Merge pull request #19059 from rallytime/docs_fix 
Correct master_sign_key_name reference
 2014-12-17 12:15:56 -07:00
Erik Johnson
721699d2bb Fix traceback for non-string values in lxc config files 
Resolves #19055.
 2014-12-17 13:05:48 -06:00
rallytime
926c486587 Correct master_sign_key_name reference 
Fixes #19053
 2014-12-17 11:32:23 -07:00
Elias Probst
31760e3928 Fix backup and pre-/append behaviour in modules.file.replace(): 2014-12-17 12:06:58 +01:00
Elias Probst
6363aa22ac Add integration tests for 'modules.file.replace()'. 2014-12-17 12:06:58 +01:00
Jason Wolfe
317ff52631 The uninstall operation needs to inherit DPKG_ENV_VARS set above as install and upgrade currently do. Without this packages that prompt on removal cause that state to hang. resolvconf in particular prompts you with a warning about rebooting your system after removal. 2014-12-16 18:39:10 -07:00
Seth House
7ce1becf34 Added note about using log_level_logfile with log_granular_levels 2014-12-16 18:18:21 -07:00
Seth House
90edd2185b Removed trailing comma from log_granular_levels example; is invalid YAML 
Thanks to F. Langelier for the report.
 2014-12-16 18:13:07 -07:00
Thomas S Hatch
df4cf1c506 Merge pull request #19033 from rallytime/disable_tests 
Disable zcbuildout tests as they are not running reliably.
 2014-12-16 17:04:00 -07:00
Thomas S Hatch
b93a77fd5b Merge pull request #19031 from rallytime/pylint_fix 
Fix yumpkg pylint error
 2014-12-16 16:49:48 -07:00
rallytime
b76f49b9d0 Pylint fix and skip all of the classes 2014-12-16 16:21:27 -07:00
rallytime
7f258bf729 Disable zcbuildout tests as they are not running reliably. 
These tests are not running reliably, aren't quite testing the functionalty
the way they should, and take too long to run as unit tests. When these get
reinstated, they should be implemented as integration tests instead of unit
tests.
 2014-12-16 16:00:51 -07:00
Thomas S Hatch
b448a152af Merge pull request #19019 from jacksontj/2014.7-config 
Backport #19012 to 2014.7
 2014-12-16 13:01:55 -07:00
Thomas S Hatch
f960a87c7a Merge pull request #19024 from galet/fix-ini-manage-for-nonstrings 
Fix ini_manage state - equality detection for non-string values
 2014-12-16 12:30:26 -07:00
rallytime
6916bdea1f Fix yumpkg pylint error 2014-12-16 11:08:22 -07:00
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
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