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,893 Commits 24 Branches 182 Tags 341 MiB
f762ab1b19
Commit Graph

45893 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Joseph Hall
115c2068b0 Allow writing decoded data to file 2015-01-29 10:07:38 -07:00
Mathieu Le Marec - Pasquet
8cbeeff3df Lint 2015-01-29 17:40:51 +01:00
Thomas Jackson
f2b3c1657e Lazily load functions, since lots of clients don't even execute runners 2015-01-29 07:44:10 -08:00
Joseph Hall
03deef181b Merge pull request #20168 from Trax-air/fix-volumes-azure 
Fix volumes azure
 2015-01-29 07:45:43 -07:00
Flavian
920c1f6eb2 Replace " by ' 2015-01-29 15:23:14 +01:00
Flavian
fc1053e7ee Raises a more meaningful exception 2015-01-29 14:41:09 +01:00
Flavian
cef090cc6c Added _wait_for_async for asynchronous operations 2015-01-29 14:28:22 +01:00
Jayesh Kariya
0b1bade648 resolved the error 2015-01-29 16:00:21 +05:30
Mathieu Le Marec - Pasquet
8a99dc4af5 Add a compat layer on zc.buildout state. 
This fixes #20184
 2015-01-29 11:11:32 +01:00
Flavian
f5fb1f758e Fixing pylint errors 2015-01-29 10:36:29 +01:00
Jayesh Kariya
8cedb4b71d adding htpasswd unit test case 2015-01-29 14:49:32 +05:30
Jayesh Kariya
2ab996d135 adding hipchat test case 2015-01-29 14:25:25 +05:30
Jayesh Kariya
acf1f5ffc6 adding guestfs unit test case 2015-01-29 14:18:38 +05:30
Thomas Jackson
c89262c758 Lazily load functions, since lots of clients don't even execute runners 2015-01-28 20:20:15 -08:00
Russell Ballestrini
eaf87e63ec modified: salt/modules/hg.py 2015-01-28 23:14:30 -05:00
Cimarron Mittelsteadt
acaafda038 BUG: Removed extra quotes in hg.clone (not needed as cmd is already split as list) which was causing hg to abort on non-local repos like "ssh://...." 2015-01-28 23:06:39 -05:00
Russell Ballestrini
3763e056f2 Added hg identity argument to state and module 
We now support supplying a private SSH key path for authentication.

      modified:   salt/modules/hg.py
      modified:   salt/states/hg.py
 2015-01-28 22:57:50 -05:00
Joseph Hall
f5e8b4a10e Don't default CA bundle updates to a non-standard location 2015-01-28 20:09:13 -07:00
Thomas Jackson
dd045dfc9f 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-28 19:00:35 -08:00