valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
61,564 Commits 24 Branches 182 Tags 341 MiB
4cd30db2dc
Commit Graph

61564 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
B M Corser
4cd30db2dc Decode some more filenames 2015-11-10 09:32:27 +00:00
Seth House
ded5c151cd Merge pull request #28718 from sjmh/fix/cherrypy_null_post 
Account for no POST data
 2015-11-09 16:34:23 -07:00
Steve Hajducko
cbce857d7c Account for no POST data 
The serving.request doesn't include a raw_body when the POST data
is blank, so set it to an empty dict.

Also fixed a bug where we assumed that if data wasn't a list, it
was a dict, which bombs because null POSTS result in None.
 2015-11-09 15:23:06 -08:00
Mike Place
26fd2bc89e Merge pull request #28215 from s0undt3ch/features/signal-handling 
Proper signal handling
 2015-11-09 12:11:15 -07:00
Mike Place
fd571890b9 Merge pull request #28686 from jeanpralo/add-validate-dockercompose-get 
set a valid flag for docker-compose file  on get method
 2015-11-09 11:13:50 -07:00
Mike Place
46b5c24c05 Merge pull request #28697 from s0undt3ch/features/process-names 
Provide readable process names
 2015-11-09 11:13:22 -07:00
Nicole Thomas
668abdd9a5 Merge pull request #28696 from s0undt3ch/develop 
Update to latest bootstrap script v2015.11.09
 2015-11-09 10:50:35 -07:00
Nicole Thomas
f641de2825 Merge pull request #28690 from MrCitron/fix-28689 
Fix 28689 : Check s3 ext pillar cache file before calculating expiration
 2015-11-09 10:17:01 -07:00
Pedro Algarvio
32f324db69 Pass a name to allow which engine is being started 2015-11-09 16:37:57 +00:00
Pedro Algarvio
dcdd34375a Allow passing a name to ProcessManager.add_process 2015-11-09 16:37:57 +00:00
Pedro Algarvio
72681fa972 Avoid <type 'type'> in the process name 2015-11-09 16:37:56 +00:00
Pedro Algarvio
f4f8849bda Update to latest bootstrap script v2015.11.09 
* Make sure that wget is installed. saltstack/salt-bootstrap#868
 2015-11-09 16:31:28 +00:00
Metin OSMAN
75a658e217 Fix 28689 : Check s3 ext pillar cache file before calculating expiration 2015-11-09 09:22:49 +01:00
Jean Praloran
5200971f4c set a valid flag for docker-compose file on get method 2015-11-09 15:18:19 +13:00
Mike Place
759242a6ec Merge pull request #28671 from jfindlay/multi_mod 
implement multiple modules in the kmod state
 2015-11-07 19:11:52 -07:00
Justin Findlay
14cb754622 update kmod state docs to include multiple modules 2015-11-07 16:15:01 -07:00
Justin Findlay
8524281f4e update kmod exec and state module unit tests 2015-11-07 16:04:23 -07:00
Justin Findlay
4691feeba8 return error if kernel mod fails to (un)load 2015-11-07 16:04:23 -07:00
Justin Findlay
195d3f9bd2 unload multiple kernel modules in kmod state 2015-11-07 16:04:23 -07:00
Justin Findlay
b8b6b9b4cd load multiple kernel modules in kmod state 
Implements #28568.
 2015-11-07 16:04:23 -07:00
Justin Findlay
3b11d85281 Merge pull request #28679 from johnsocp/issue_28678 
Adding err variable definition to fix error that is preventing rest_tornado from initializing
 2015-11-07 15:50:23 -07:00
Johnson
404fb9abe7 Adding variable definition for issue #28678 2015-11-07 09:41:27 -08:00
Mike Place
efd50fcd46 Merge pull request #28670 from plastikos/bug-failed_uid_lookup 
psutil can fail to look-up a uid and raise a KeyError
 2015-11-06 20:37:54 -07:00
Mike Place
c8cc6d8298 Merge pull request #28599 from sjmh/fix/etcdmod 
Refactor etcd modules
 2015-11-06 20:37:25 -07:00
Thayne Harbaugh
8fc89a131e psutil can fail to look-up a uid and raise a KeyError 2015-11-06 17:42:28 -07:00
Steve Hajducko
455f40b0d2 Refactor etcd modules 
The etcd modules were using bits and pieces of python-etcd directly and
were using outdated exceptions to catch errors.  These errors were
causing issues when trying to use etcd modules for logic.

A summary of changes
    - Most of the 'work' is now done in etcd_util
    - Removed import of python-etcd from states/etcd_mod and the
      returner
    - Added new tests for etcd_util
    - Put in proper exceptions and catches for python-etcd
    - Added support for ValueError catching.  python-etcd doesn't
      support python 2.6 and raises ValueError when trying to format
      exceptions
    - Added watch function to etcd execution module
    - Added autospec to unit tests so hopefully less brittle
    - Added TTL and directory features to the set function

*BACKWARDS INCOMPATIBLE CHANGES*

All interfaces are still backwards incompatible.  However, the returns
from several of the etcd util functions have been changed.  The old
returns presented issues with certain test cases.  For instance, a
failed 'get' returned '', but a key with no value will also return ''.

The same issues occured with the 'ls', 'tree' and 'set' functions.  Trying to
ls a blank directory returned the same result as a failed ls of a
non-existent key.
 2015-11-06 16:29:50 -08:00
Mike Place
edd60aa8e4 Merge pull request #28652 from kiorky/lxc 
LXC: add rootfs & utsname to reconfigure
 2015-11-06 11:51:40 -07:00
Nicole Thomas
a47fde638f Merge pull request #28650 from rallytime/merge-develop 
Merge branch '2015.8' into 'develop'
 2015-11-06 10:47:54 -07:00
Mathieu Le Marec - Pasquet
266931a98b LXC: add rootfs & utsname to reconfigure 2015-11-06 18:20:31 +01:00
Pedro Algarvio
20deaad536 Add missing future with_statement import 2015-11-06 17:15:29 +00:00
Erik Johnson
22bb67aea8 Merge pull request #28639 from RuriRyan/RuriRyan-patch-1 
Fixed handling of the disabled option for yumpkg
 2015-11-06 11:01:24 -06:00
Pedro Algarvio
22a57a1b86 Reword the sleep comment with a better explanation 2015-11-06 17:01:13 +00:00
Mike Place
cf8a792965 Merge pull request #28637 from s0undt3ch/features/parsers-exit-fix 
Fix max recursion error when passed flags like `--version` or `--help`
 2015-11-06 09:55:18 -07:00
rallytime
cded9ac01d Merge branch '2015.8' into 'develop' 
Conflicts:
- salt/cloud/clouds/vmware.py
- salt/modules/freebsdpkg.py
- salt/modules/virtualenv_mod.py
- salt/states/boto_asg.py
- tests/integration/__init__.py
- tests/runtests.py
 2015-11-06 09:34:31 -07:00
Mike Place
73208b4fb1 Merge pull request #28636 from s0undt3ch/hotfix/context-deepcopy 
salt.utils.context deepcopy fix
 2015-11-06 09:14:32 -07:00
Pedro Algarvio
9c8457a1d8 A little lint 2015-11-06 14:23:01 +00:00
Pedro Algarvio
b55fa48ae6 Switch to SignalHandlingMultiprocessingProcess 2015-11-06 14:17:53 +00:00
Pedro Algarvio
aa7bc2ef65 Use salt.utils.process.MultiprocessingProcess 2015-11-06 14:11:55 +00:00
Pedro Algarvio
0a0a86069b Lint fix 2015-11-06 14:06:04 +00:00
Pedro Algarvio
1b04d1d815 Fix globals SyntaxWarning's 2015-11-06 13:30:26 +00:00
RuriRyan
2eedc260cb Fixed handling of the disabled option for yumpkg 
It wasn't possible do set enabled back to 1 via state files. So if you once disabled a repository you couldn't enable it again.

This line fixes all the weird behaviour in simply converting disabled=True/False to enabled=0/1 respectively.
 2015-11-06 14:28:30 +01:00
Pedro Algarvio
dfde6b8f61 Fix max recursion error when passed flags like --version or --help 
The recursion happened because the merged config dictionary is not
evaluated for those kind of flags.
 2015-11-06 13:18:46 +00:00
Pedro Algarvio
49c9555e37 Explain why we need the time.sleep 2015-11-06 13:15:14 +00:00
Pedro Algarvio
f1139fc94b Fix multiprocessing logging setup 
* Only create a multiprocessing Queue for logging in the MainProcess
* Only start and stop the multiprocessing logging listener in the MainProcess
* Only setup multiprocessing logging if not in the MainProcess
* And, as incredible as it may seem, we need to sleep after setting up multiprocessing logging for the new process or we'll end up in some kind of futex wait lock
 2015-11-06 13:15:14 +00:00
Pedro Algarvio
c6ec938290 Make the __MP_LOGGING_QUEUE_PROCESS a daemon process 2015-11-06 13:15:14 +00:00
Pedro Algarvio
f947ebcc2d Include the class name 2015-11-06 13:15:14 +00:00
Pedro Algarvio
bb125f105f Explicitly delete schedule 2015-11-06 13:15:14 +00:00
Pedro Algarvio
adebbe1415 Explicitly call minion.destroy() 2015-11-06 13:15:14 +00:00
Pedro Algarvio
3b183e8fa7 Destroy the ZMQ context as a multiprocessing.util.Finalize call 2015-11-06 13:15:14 +00:00
Pedro Algarvio
64d2366009 IOLoop knows how/when to stop on signals 2015-11-06 13:15:14 +00:00