valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
45,912 Commits 24 Branches 182 Tags 341 MiB
3c4a997b01
Commit Graph

45912 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Julian
d83bf53555 Issue #20235: blockdev.format fails when succeeding 
After a mkfs is issued, an immediate lsblk will show the device as
unformatted. Issuing a sync before lsblk will allow the check to
succeed.
 2015-01-29 20:16:40 -08:00
Mike Place
2988b0d13f Merge pull request #20232 from jacksontj/saltnado 
Remove unecessary finish() calls
 2015-01-29 19:34:53 -07:00
Thomas Jackson
641c76edb4 Remove unecessary finish() calls 
finish() only needs to be called after functions with @asynchronous decorators, coroutines don't count
 2015-01-29 17:58:30 -08:00
rallytime
9898fcf613 Merge branch '2015.2' into 'develop' 
Conflicts:
	.gitignore
	.pylintrc
	.testing.pylintrc
	salt/client/mixins.py
	salt/cloud/clouds/msazure.py
	salt/config.py
	salt/modules/mount.py
	salt/runners/doc.py
	salt/utils/event.py
	salt/utils/reactor.py
 2015-01-29 17:24:04 -07:00
Nicole Thomas
34e0cab774 Merge pull request #20228 from rallytime/pylinting 
Pylint fix for 2015.2
 2015-01-29 16:37:10 -07:00
rallytime
cabf5ffd5d Pylint fix for 2015.2 2015-01-29 16:36:27 -07:00
Thomas Jackson
a4e35de8a8 More specific error message. 
The old message was misleading because if the file was missing it said "permissions error", when in fact its *any* IOError
 2015-01-29 14:34:15 -08:00
Nicole Thomas
6e8e3917b3 Merge pull request #20219 from rallytime/backport_19829 
Backport #19829 to 2015.2
 2015-01-29 15:24:56 -07:00
Nicole Thomas
1632553c23 Merge pull request #20215 from rallytime/bp-19566 
Backport #19566 to 2015.2
 2015-01-29 15:24:16 -07:00
Nicole Thomas
cfaba40f4b Merge pull request #20214 from rallytime/merge_forward_fifteen_second_try 
Merge forward fifteen second try
 2015-01-29 15:09:53 -07:00
Mike Place
fcec870e36 Merge pull request #20213 from cachedout/expected_args 
Add username/password to expected args
 2015-01-29 14:47:36 -07:00
Nicole Thomas
738a7c8c44 Merge pull request #20209 from rallytime/bp-20166 
Backport #20166 to 2015.2
 2015-01-29 14:29:02 -07:00
Alexander Haase
203b700032 Another pass over modules/mount.py against pylint.... 2015-01-29 14:13:19 -07:00
Alexander Haase
5c5d123bc8 Another pass over modules/mount.py against pylint.... 2015-01-29 14:13:14 -07:00
Alexander Haase
f3eba17d43 More pylint fixes for changes to modules/mount.py 2015-01-29 14:13:07 -07:00
Alexander Haase
da75fa8ce0 PEP style compliance for changes to states/mount.py 2015-01-29 14:13:02 -07:00
Alexander Haase
61a0421adc PEP style compliance for changes to modules/mount.py 2015-01-29 14:12:41 -07:00
Alexander Haase
ba1dcb972b Updating modules/mount.py (mount.fstab) to produce an array for opts, rather than the opts string literal. Allows mount to pass unit tests 2015-01-29 14:12:35 -07:00
Alexander Haase
02cc8bb631 Fixed whitespace error, ran unit tests 2015-01-29 14:12:28 -07:00
Alexander Haase
9b1caf6b42 Normalizing white space to four spaces to remedy pylint errors 2015-01-29 14:12:21 -07:00
Alexander Haase
61250467e4 Debugged & moderately tested match_on functionality for modules/mount and states/mount with relation to fstab. 2015-01-29 14:12:14 -07:00
Alexander Haase
3fd2e254f9 Debugged & moderately tested match_on functionality for modules/mount and states/mount with relation to fstab. 2015-01-29 14:12:06 -07:00
Alexander Haase
ec0e4d328d Adding rework for mount match-on criteria. Implimented core class in mount/modules to represent and match fstab entries. Re-implimented related methods in DRY compliance. 2015-01-29 14:11:48 -07:00
Steve Weber
44ca51e55b fix returning docs when some minions did not return 
when using
```salt \* pkg -d```
some minions will not return and you get an ugly error:

```
[root@salt salt]# salt oat-app\* pkg -d
[ERROR   ] An un-handled exception was caught by salt's global exception handler:
TypeError: string indices must be integers, not str
Traceback (most recent call last):
  File "/usr/bin/salt", line 10, in <module>
    salt_main()
  File "/usr/lib/python2.6/site-packages/salt/scripts.py", line 343, in salt_main
    client.run()
  File "/usr/lib/python2.6/site-packages/salt/cli/salt.py", line 175, in run
    self._output_ret(ret, out)
  File "/usr/lib/python2.6/site-packages/salt/cli/salt.py", line 262, in _output_ret
    self._print_docs(ret)
  File "/usr/lib/python2.6/site-packages/salt/cli/salt.py", line 303, in _print_docs
    if ret[host][fun]:
TypeError: string indices must be integers, not str
Traceback (most recent call last):
  File "/usr/bin/salt", line 10, in <module>
    salt_main()
  File "/usr/lib/python2.6/site-packages/salt/scripts.py", line 343, in salt_main
    client.run()
  File "/usr/lib/python2.6/site-packages/salt/cli/salt.py", line 175, in run
    self._output_ret(ret, out)
  File "/usr/lib/python2.6/site-packages/salt/cli/salt.py", line 262, in _output_ret
    self._print_docs(ret)
  File "/usr/lib/python2.6/site-packages/salt/cli/salt.py", line 303, in _print_docs
    if ret[host][fun]:
TypeError: string indices must be integers, not str
```

the patch is is ugly!!! so please fix correctly.
```
            if ret[host] == 'Minion did not return. [Not connected]':
                continue
```

thanks
 2015-01-29 15:53:33 -05:00
rallytime
9db1a61165 Pylint fix 2015-01-29 13:51:13 -07:00
Flavian
fb2377c076 #19162 added disks to Azure VM creation. Only new empty disks are 
supported. Add a line
volumes:
  - { size: 10 (default 100), lun: [0-15](default: 0), disk_label:
<label>(default: <role-name>-disk-<lun>) }
 2015-01-29 13:48:48 -07:00
rallytime
c65d9673a7 Merge branch '2014.7' into merge_forward_fifteen_second_try 
Conflicts:
	salt/states/file.py
 2015-01-29 13:42:49 -07:00
Mike Place
449e991e76 Add username/password to expected args 
Fixes many broken netapi functions, such as wheel.key.list_all
 2015-01-29 13:41:22 -07:00
Nicole Thomas
4aeaec7a94 Merge pull request #20212 from saltstack/revert-20156-bp-19566 
Revert "Backport #19566 to 2014.7"
 2015-01-29 13:40:13 -07:00
Nicole Thomas
9fef292d3d Revert "Backport #19566 to 2014.7" 2015-01-29 13:39:58 -07:00
Mike Place
325af0f674 Catch all exceptions in reactor 
There is a possible bug wherein uncaught exceptions seem to make zmq3
tip over when threading is involved. This is an attempt to prevent that
from happening. (The cause of the exceptions will need to be
investigated as well, most specifically wheel.key)
 2015-01-29 12:53:18 -07:00
Nicole Thomas
bf9c989858 Merge pull request #20178 from jacksontj/saltnado 
Saltnado performance improvements
 2015-01-29 12:42:54 -07:00
Mathieu Le Marec - Pasquet
b00fd8ea1e lint 2015-01-29 20:27:07 +01:00
Thomas Jackson
8ea041b0ca Massive speedup to saltnado 
This mixin was creating 3 localclients and 1 runner client per request-- which takes ~6s. Now we build the set of clients once per process
 2015-01-29 10:32:58 -08:00
C. R. Oldham
d3524e9291 Merge pull request #20200 from techhat/decodeout 
Allow writing decoded data to file
 2015-01-29 11:00:10 -07:00
Thomas S Hatch
aae6a340d8 Merge pull request #20192 from Trax-air/azure-async 
Raises an exception when something goes wrong with VM creation
 2015-01-29 10:41:47 -07:00
Thomas S Hatch
1fc9a52ead Merge pull request #20186 from makinacorpus/f 
Add a compat layer on zc.buildout state.
 2015-01-29 10:40:14 -07:00
Thomas S Hatch
50aeea25a2 Merge pull request #20183 from jayeshka/htpasswd-unit-test 
adding htpasswd unit test case
 2015-01-29 10:39:55 -07:00
Thomas S Hatch
6a6bc56958 Merge pull request #20181 from jayeshka/hipchat-unit-test 
adding hipchat test case
 2015-01-29 10:39:36 -07:00
Thomas S Hatch
9698e49930 Merge pull request #20180 from jayeshka/guestfs-unit-test 
adding guestfs unit test case
 2015-01-29 10:39:20 -07:00
Thomas S Hatch
a525c43e9b Merge pull request #20179 from russellballestrini/hg-identity-refactor 
Added hg identity argument to state and module
 2015-01-29 10:38:43 -07:00
Thomas S Hatch
11dad072b3 Merge pull request #20177 from techhat/httpupdate 
Don't default CA bundle updates to a non-standard location
 2015-01-29 10:35:56 -07:00
Thomas S Hatch
eb19ccd99e Merge pull request #20174 from kim0/freebsd-status.meminfo 
Implement freebsd-status.meminfo
 2015-01-29 10:34:38 -07:00
Joseph Hall
d93f433843 Linting 2015-01-29 10:33:17 -07:00
Thomas S Hatch
b469df1b28 Merge pull request #20172 from jacksontj/develop 
Fix for #20170
 2015-01-29 10:32:38 -07:00
Thomas S Hatch
504cbd97c6 Merge pull request #20171 from plastikos/develop 
Minor: Improve thin and shim warnings and comments.
 2015-01-29 10:31:00 -07:00
Thomas S Hatch
d04999d741 Merge pull request #20163 from jfindlay/fix_sysctl 
fix sysctl test state comparison
 2015-01-29 10:29:46 -07:00
Mike Place
d6250e9206 Merge pull request #20202 from cachedout/log_flaky_zmq_test 
Add some logging to flaky test
 2015-01-29 10:29:39 -07:00
Thomas S Hatch
b6983e755c Merge pull request #20086 from jacksontj/2015.2 
2015.2: Runner compatibility
 2015-01-29 10:29:08 -07:00
Mike Place
d772ddb2bf Add some logging to flaky test 
We need to see what's happening in the echo server to figure out why
this occasionally fails.
 2015-01-29 10:27:31 -07:00