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
58,985 Commits 24 Branches 182 Tags 341 MiB
0630b977e6
Commit Graph

58985 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
0630b977e6 Accept new pillar_enc argument to specify decryption renderer 2015-09-21 17:48:48 -05:00
Erik Johnson
801a49c8e2 Add ability to decrypt CLI pillar data 2015-09-17 22:35:50 -05:00
Erik Johnson
f02b1dd8bf Support decrypting ciphertext with newlines as literal '\n' 
This allows for CLI pillar data to be passed to the gpg renderer and the
newlines translated from '\n' to actual newline characters so that the
ciphertext can be decrypted successfully.
 2015-09-17 22:34:38 -05:00
Mike Place
6747400e1c Merge pull request #27174 from tinyclues/26505_saltnado_improve_accept_support 
Improve support of Accept header in saltnado.
 2015-09-17 12:04:25 -06:00
Mike Place
3717330d04 Merge pull request #27192 from DSRCompany/issues/26885_salt_call_zmq_monitor_fix 
Correclty install zeromq ioloop.
 2015-09-17 11:26:18 -06:00
Dmitry Kuzmenko
98a9ea5007 Correclty install zeromq ioloop. 2015-09-17 17:48:01 +03:00
Justin Findlay
d988aa2145 Merge pull request #27180 from tankywoo/file-copy-result-true-in-test 
file copy ret result True if no change in test mode
 2015-09-17 00:27:43 -06:00
Tanky Woo
8e3eecb03b file copy ret result True if no change in test mode 2015-09-17 13:29:56 +08:00
FELD Boris
5e9c3c7d96 Improve support of Accept header in saltnado. 
It currently supports 'simple' values like application/json, but Accept header
could also include more than one value with parameters
See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1.
For example:

```application/json, text/javascript, */*; q=0.01```

This PR add support for multiple media_range in Accept header, support parsing
of parameter (like q=0.01) but discard them and finally iterate on
media_range and take the first compatible.

A more complete implementation may fully supports the RFC and support
q parameter and specific order of priority to find the most compatible
Content-Type but I don't think it's worth the pain.

If we want a better implementation, werkzeug has actually an implementation
http://werkzeug.pocoo.org/docs/0.10/datastructures/#werkzeug.datastructures.Accept.best_match.
 2015-09-17 00:48:34 +02:00
Colton Myers
6c69077b7a Merge pull request #26924 from jodv/remove_dupe_auth 
remove extra call to time_auth from ClearFuncs
 2015-09-16 10:59:24 -06:00
Mike Place
690abc156d Merge pull request #27140 from skizunov/develop2 
Port 'TCP' transport to work on Windows
 2015-09-16 09:12:44 -06:00
Mike Place
47cf7f5a75 Merge pull request #27142 from tinyclues/26505_cors_support_saltnado 
Add support for CORS in saltnado. Ref #26505
 2015-09-16 09:09:08 -06:00
Mike Place
f966fc766d Merge pull request #27148 from hexedpackets/develop 
Pass file pointers to the serialize load functions.
 2015-09-16 09:05:18 -06:00
Mike Place
7fa45d671a Merge pull request #27145 from rallytime/softlayer_hw_categories 
Add show_all_categories function to softlayer_hw driver
 2015-09-16 09:04:11 -06:00
Mike Place
3c6a13a6de Merge pull request #27153 from twangboy/fix_23768 
Feature: Added cache_file parameter to pkg.install
 2015-09-16 09:01:16 -06:00
twangboy
b77b01fadd Fixed some lint 2015-09-15 23:07:09 -06:00
twangboy
3795396b72 Added cache_file parameter to pkg.install 2015-09-15 22:44:23 -06:00
twangboy
407f6a738c Added cache_file option 2015-09-15 17:45:33 -06:00
William Huba
f9c05e73a7 Pass filepointers to the serialize load functions. 2015-09-15 16:17:27 -04:00
rallytime
3e8fcec48b Add show_all_categories function to softlayer_hw driver 2015-09-15 12:44:29 -06:00
FELD Boris
ef3b7ddc2d Fix lints 2015-09-15 20:29:18 +02:00
FELD Boris
b13f66ee4b Add support for CORS in saltnado. 
Add support for CORS and tests in RPC salt-api. The code was inspired by
https://github.com/globocom/tornado-cors.

Also add support for CORS in websocket. By adding some tests, I made
a small refactoring to make the websocket handler more easily testable.

Some documentation about CORS could be found here
https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS
for reference.
 2015-09-15 18:52:44 +02:00
Sergey Kizunov
88913cc451 Port 'TCP' transport to work on Windows 
salt/transport/ipc.py:
- The 'socket_path' parameter may also be of type 'int'. If this is the
case, it will be used as the port for a tcp localhost connection.

salt/transport/tcp.py
- If opt['ipc_mode'] is 'tcp', then using
opts['tcp_master_publish_pull'] to get the port number to be used for
the tcp localhost connection. This is similar to the zeromq logic.
- In TCPReqServerChannel, moving socket creation from pre_fork to
post_fork. It isn't needed in pre_fork (the parent process doesn't
need to access it), and on Windows, then spawning a process, the
'socket' is not picklable. Making sure close() will still work in
both parent and child processes by initializing '_socket' to None and
closing only if it isn't None.
- Avoiding this error message that seems to always occur when
SaltMessageClient is destroyed:
'[ERROR   ] Future exception was never retrieved: StreamClosedError'
This may be related with issue #25718.
This happens because the logic is always waiting to read the next
message and the associated read future is marked 'StreamClosedError'
when the stream is closed.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2015-09-15 11:05:20 -05:00
Mike Place
d3ba23e304 Merge pull request #27132 from DSRCompany/bugfix/27108_executor_args_typeerror 
Fix #27108: TypeError in direct_call executor if kwargs include "opts"
 2015-09-15 08:34:33 -06:00
Mike Place
1be887628e Merge pull request #26846 from douardda/patch-2 
add -oIdentitiesOnly=yes to the ssh command line
 2015-09-15 08:33:56 -06:00
Dmitry Kuzmenko
100292d9c8 Fix #27108: TypeError in direct_call executor if kwargs include "opts" 
Pass function arguments to executor as a collections not as executor args.
 2015-09-15 15:32:10 +03:00
Justin Findlay
d4533d0656 Merge pull request #27126 from jfindlay/macgroup 
Merge #27009
 2015-09-15 01:41:45 -06:00
Justin Findlay
d12ebf84de single quote string in mac_group exec mod 2015-09-15 01:39:54 -06:00
Justin Findlay
1ba188d0b3 Merge pull request #27123 from cedwards/freebsd_docs 
update for freebsd installation documentation
 2015-09-15 01:25:20 -06:00
Christer Edwards
d55f3f79cb Update freebsd.rst 
fix URL, typ in saltstack repo config
 2015-09-14 21:44:44 -06:00
Christer Edwards
ab53cd2970 update for freebsd installation documentation 2015-09-14 21:34:35 -06:00
Mike Place
634264f443 Merge pull request #27112 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-09-14 15:50:08 -06:00
Colton Myers
896313bff0 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/pillar/s3.py
 2015-09-14 15:01:41 -06:00
Mike Place
66d8f51d31 Merge pull request #26929 from steverweber/keepalive 
Keepalive fixes
 2015-09-14 14:00:50 -06:00
Mike Place
1c7b3188bd Merge pull request #27104 from hexedpackets/develop 
Remove only the file extension when checking missing cached nodes.
 2015-09-14 13:56:59 -06:00
Mike Place
5bc3b968ad Merge pull request #27099 from plastikos/bug-fix_summary2 
Fix access to ret parameter of _print_returns_summary() (reverts 54b33dd359 #24732)
 2015-09-14 13:55:39 -06:00
Mike Place
a87a62c5b6 Merge pull request #26857 from bradthurber/add_jboss_domain_mode_to_jboss7_modules 
add jboss domain mode to jboss7 python modules
 2015-09-14 13:40:26 -06:00
Mike Place
e844d45e03 Merge pull request #26999 from skizunov/develop2 
Fix salt-master to run on Windows
 2015-09-14 13:32:14 -06:00
Mike Place
bdd6264398 Merge pull request #27101 from adelcast/dev/adelcast/add_network_settings_beacon 
Add beacon to monitor network settings
 2015-09-14 13:29:15 -06:00
Alejandro del Castillo
7cca5c987b Merge pull request #1 from cachedout/py3_network_settings 
Absolute import to satisfy Py3 compat
 2015-09-14 14:27:39 -05:00
Mike Place
9a62ad17fe Merge pull request #27106 from rallytime/versionadded-26855 
Versionadded for #26855
 2015-09-14 13:15:57 -06:00
Mike Place
ebeec62260 Merge pull request #27087 from rallytime/gpg-collapsible-ifs 
Collapse if statements in gpg module
 2015-09-14 13:15:37 -06:00
Mike Place
f0b41e4577 Merge pull request #26962 from ctrlrsf/state-verbose-flag 
Add --state-verbose command line option to salt cmd
 2015-09-14 13:13:26 -06:00
rallytime
c9837861c8 Versionadded for #26855 2015-09-14 13:12:45 -06:00
Mike Place
21daed7d6b Merge pull request #27090 from rallytime/user-collapsible-ifs 
Code Cleanup of salt/states/user.py
 2015-09-14 13:09:45 -06:00
Mike Place
17c7d957d2 Merge pull request #26855 from benburkert/postgres-default-password 
add the default_password argument to the postgres_user.present state
 2015-09-14 13:05:46 -06:00
Mike Place
b13b6b912a Merge pull request #26984 from tinyclues/26505_improve_content_type_support 
[NetAPI] SaltNado - Improve support for Content-Type parsing. Ref #26505
 2015-09-14 13:02:28 -06:00
Mike Place
e3aa2ab279 Merge pull request #26989 from isbm/isbm-package-info 
Package information
 2015-09-14 12:56:51 -06:00
Mike Place
5cc93f8b05 Merge pull request #27102 from s0undt3ch/develop 
Minor SPM enhancements
 2015-09-14 12:54:32 -06:00
Mike Place
be2bb43403 Merge pull request #27071 from rallytime/bootstrap-rackspace-driver 
Switch Rackspace driver to use salt.utils.cloud.bootstrap()
 2015-09-14 12:53:04 -06:00