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

61658 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorge Schrauwen
b58793cb72 even more context for log message when available 2015-11-11 16:22:38 +00:00
Jorge Schrauwen
e82d819f03 drop outer parens, not needed 2015-11-11 16:11:26 +00:00
Jorge Schrauwen
25d120e656 add indication where the log messages come from 2015-11-11 15:59:33 +00:00
Jorge Schrauwen
dbf472cad0 switch to salt.utils.fopen for _read_config and _write_config 2015-11-11 15:53:36 +00:00
Jorge Schrauwen
21dce2daea add main docs section 2015-11-11 11:48:42 +00:00
Jorge Schrauwen
7b137148e4 implement smartos.vm_absent and smartos.vm_present 2015-11-11 11:17:18 +00:00
Jorge Schrauwen
a0b171f64c implement smartos.vm_stopped and smartos.vm_started 2015-11-11 10:50:08 +00:00
Jorge Schrauwen
73e9aec250 implement smartos.image_present, smartos.image_absent, and smartos.image_vacuum 2015-11-11 10:35:53 +00:00
Jorge Schrauwen
edb382cda8 implement smartos.config_present and smartos.config_absent 2015-11-11 10:21:22 +00:00
Justin Findlay
7c5811ddf0 Merge pull request #28725 from quantonganh/boto-describe-route-table 
boto_vpc: return an empty dict in case cannot get the route tables
 2015-11-10 20:16:35 -07:00
Mike Place
aa8f117e81 Merge pull request #28736 from bmcorser/patch-1 
Decode some more filenames
 2015-11-10 11:48:08 -07:00
Mike Place
aeafdd5c22 Merge pull request #28740 from MasterNayru/s3-urls-fix 
Add missing S3 module import
 2015-11-10 11:35:22 -07:00
Mike Place
b7a23ed2e2 Merge pull request #28741 from Unity-Technologies/hotfix/win-process-grains 
Removing uid and gid from windows minion grains as they are not suppo…
 2015-11-10 11:34:34 -07:00
Colton Myers
87365212b4 Merge pull request #28723 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-11-10 11:26:29 -07:00
Mike Place
590f503fb8 Merge pull request #28748 from tinyclues/cors_url_with_arguments 
[Saltnado] - Add support for CORS preflight request for parametrized urls
 2015-11-10 11:24:30 -07:00
FELD Boris
049815fb34 Add support for cors preflight request for parametrized urls 
The implementation was broken for jobs and minions handlers
 2015-11-10 18:37:03 +01:00
Daniel Hobley
cb56200178 Removing uid and gid from windows minion grains as they are not supported 2015-11-10 13:56:04 +01:00
Jarrod Moore
012d539b26 Add missing S3 module import 
In the get_url method, a salt.utils.s3.query method call is made, but this won't work unless the salt.utils.s3 module is imported. This missing line breaks file.managed resources where source and source_hash attributes use s3:// URLs.
 2015-11-10 22:08:36 +11:00
B M Corser
4cd30db2dc Decode some more filenames 2015-11-10 09:32:27 +00:00
Quan Tong Anh
b4a6339ab2 boto_vpc: return an empty dict in case cannot get the route tables 2015-11-10 07:19:51 +07:00
Colton Myers
8a23181dd7 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/modules/boto_secgroup.py
    salt/modules/rabbitmq.py
    salt/modules/win_system.py
    salt/modules/yumpkg.py
    salt/states/mount.py
 2015-11-09 17:05:43 -07:00
Colton Myers
989069f44a Merge pull request #28709 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-11-09 16:38:27 -07: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
8d5ab15c16 Merge pull request #28710 from rallytime/fix-28469 
Pass kwargs correctly to _get_group from get_group_id
 2015-11-09 15:29:09 -07:00
Colton Myers
2d04ddc108 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-11-09 15:28:14 -07:00
Colton Myers
c90431eddc Rip out unit test that doesn't apply anymore 
We now use -q with the command so we don't have to test our ability to
strip "Listing vhosts" out of the test
 2015-11-09 15:22:01 -07:00
rallytime
0571608f5d Pass kwargs correctly to _get_group from get_group_id 
Fixes #28469
 2015-11-09 12:34:36 -07:00
Pedro Algarvio
f40c617bad Merge pull request #28705 from cachedout/tornado_http_headers 
Account for new headers class in tornado 4.3
 2015-11-09 19:24:33 +00:00
Colton Myers
aeeaa7c90d Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/config.py
    salt/minion.py
    salt/pillar/s3.py
 2015-11-09 12:12:24 -07: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
Mike Place
cfa0cec19c Merge pull request #28698 from rallytime/bp-28530 
Back-port #28530 to 2015.8
 2015-11-09 11:11:51 -07:00
Mike Place
604a7b4199 Merge pull request #28699 from rallytime/bp-28670 
Back-port #28670 to 2015.5
 2015-11-09 11:10:58 -07:00
Mike Place
2fe9e2e7c5 Merge pull request #28700 from rallytime/bp-28679 
Back-port #28679 to 2015.8
 2015-11-09 11:07:44 -07:00
Mike Place
7bd3eb8370 Merge pull request #28703 from rallytime/bp-28690 
Back-port #28690 to 2015.5
 2015-11-09 11:01:57 -07:00
Mike Place
7ac6cde1ee Account for new headers class in tornado 4.3 
This started to fail with the test:  integration.netapi.rest_tornado.test_app.TestWebhookSaltAPIHandler.test_post

This happened with the introduction of Tornado 4.3 wherein headers were delivered as a subclass of a python dict, called HTTPHeaders http://www.tornadoweb.org/en/stable/releases/v4.3.0.html

This in turn caused msgpack serialization errors as we couldn't figure out how to serialize the new class. (Somewhat ironically, since the upstream change was made to better support serialization, but c'est la vie). Instead of trying to give hints to our serialialization lib, it seemed more sensible just to cast this back into a python dictionary before we put it onto the event bus.

Tested against tornado 4.3 and 4.2
 2015-11-09 10:56:12 -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
8ccea2a855 Merge pull request #28695 from s0undt3ch/2015.8 
[2015.8] Update to latest bootstrap script v2015.11.09
 2015-11-09 10:50:15 -07:00
Nicole Thomas
2a40f57b93 Merge pull request #28694 from s0undt3ch/2015.5 
[2015.5] Update to latest bootstrap script v2015.11.09
 2015-11-09 10:49:53 -07:00
Metin OSMAN
a0988dab58 Fix 28689 : Check s3 ext pillar cache file before calculating expiration 2015-11-09 10:21:50 -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
Johnson
4e0870e636 Adding variable definition for issue #28678 2015-11-09 09:50:21 -07:00
Thayne Harbaugh
e436b23296 psutil can fail to look-up a uid and raise a KeyError 2015-11-09 09:48:58 -07:00
Sergey Kizunov
d94d0db805 AsyncTCPReqChannel will fail after 10 uses 
The issue is that the resolver that is used
(tornado.netutil.ThreadedResolver) is shared. Threads don't seem to be
returned for reuse until 'close' is invoked on the resolver. Due to
this, sharing the same Resolver object may not be a good idea. Instead,
we will configure which resolver type will be used
(tornado.netutil.ThreadedResolver) as well as the number of threads.
We will let 'tornado.tcpclient.TCPClient' create its own resolver
object (by effectively passing resolver=None). This object will pull
from the shared thread pool, but since it will be closed when
'tornado.tcpclient.TCPClient' is closed, it will return threads back to
the thread pool for later use.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2015-11-09 09:47:17 -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