Commit Graph

55706 Commits

Author SHA1 Message Date
Colton Myers
b222d4bf98 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-07-14 14:34:00 -06:00
Colton Myers
8af30cef8c Merge pull request #25412 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2015-07-14 12:01:05 -06:00
Colton Myers
4d929071e1 Merge pull request #25411 from basepi/merge-forward-2015.5
[2015.5] Merge forward from 2014.7 to 2015.5
2015-07-14 11:55:26 -06:00
Thomas S Hatch
a3d84eb2a6 Merge pull request #25415 from bechtoldt/elastic_docs
[docs] declare YAML as code block
2015-07-14 11:11:59 -06:00
Arnold Bechtoldt
79547c8152 declare YAML as code block 2015-07-14 19:08:50 +02:00
Colton Myers
2a144b954a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/ref/states/requisites.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/config.py
    salt/minion.py
    salt/modules/cp.py
    salt/pillar/__init__.py
    salt/states/file.py
2015-07-14 10:57:36 -06:00
Colton Myers
33d2451fef Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-07-14 10:46:53 -06:00
Mike Place
81bed62d16 Merge pull request #25406 from alprs/fix-apt_version_cmp_types
Force arguments to aptpkg.version_cmp into strings
2015-07-14 10:15:41 -06:00
Mike Place
bd7c71e3e4 Merge pull request #25407 from rallytime/bp-23236
Back-port #23236 to 2015.8
2015-07-14 10:09:21 -06:00
Mike Place
cd9ea63ff2 Merge pull request #25408 from rallytime/bp-25399
Back-port #25399 to 2015.5
2015-07-14 10:09:06 -06:00
Mike Place
334eafa0ef Merge pull request #25409 from rallytime/bp-24422
Back-port #24422 to 2015.8
2015-07-14 10:08:49 -06:00
Mike Place
ef9f6b0ce0 Merge pull request #25240 from tankywoo/fix-files-os-walk-multiple-times
file make os.walk only be called one
2015-07-14 10:04:49 -06:00
rallytime
a0130f5499 Update Beryllium refs to 2015.8.0 2015-07-14 09:11:57 -06:00
Arnold Bechtoldt
6fc871470b remove log entry that was used for debugging only 2015-07-14 09:06:55 -06:00
Arnold Bechtoldt
a12e287e2c improve profile mgmt 2015-07-14 09:06:48 -06:00
Arnold Bechtoldt
8de1d239e9 raise exception in modules.elasticsearch when connection to ES cluster failed 2015-07-14 09:06:41 -06:00
Arnold Bechtoldt
2676d8405c refactor elasticsearch integration
* salt.modules.elasticsearch
* salt.states.elasticsearch*
* salt.returners.elasticsearch
2015-07-14 09:06:13 -06:00
Arnold Bechtoldt
7bb074cf96 remove log entry that was used for debugging only 2015-07-14 09:02:33 -06:00
Arnold Bechtoldt
a4d1d24926 improve profile mgmt 2015-07-14 09:01:43 -06:00
Arnold Bechtoldt
fd564b87da raise exception in modules.elasticsearch when connection to ES cluster failed 2015-07-14 09:01:35 -06:00
Arnold Bechtoldt
3e2edd33d4 refactor elasticsearch integration
* salt.modules.elasticsearch
* salt.states.elasticsearch*
* salt.returners.elasticsearch
2015-07-14 09:00:26 -06:00
Jarpy
da9c0eb673 Typo in client_acl ref doc. 2015-07-14 08:54:32 -06:00
Jarpy
50e0baf270 Demonstrate per-minion client_acl.
The client_acl system supports setting restrictions based on minion name.
Update the Client ACL System reference page to reflect this.
2015-07-14 08:54:32 -06:00
Mike Place
8faa49a226 IPC transport skeleton
Basic IPC server works!

Lint

Skeleton of client

IPC bind test

Make stand-alone

Adding factories for push and pull channels

Allowing opts passing for consistency

Tests now (mostly) work

Lint

Method documentation

General cleanup. Migrate to inheritence.

Log cleanup

Migrate framing to stand-along module

Migrate ipc.py to new framer

Working except for serialization bug

Debugging

Debugging

It works!!

Remove ZeroMQ from TCP transport :]

General cleanup

Linting

General cleanup

Align socket name with what client expects

Remove unused buffer size flag

exception handling for stream close

Calls to parent class inits

Docs

Remove debugging

Remove unused function

Remove unnecessary pre/post fork on msgclient

Remove unecessary timeout flag

Better stream/socket shutdown in server

Remove unused handler

Removing more unused

More function cleanup

Removing more unneeded cruft

Lint

Round out documentation

More docs

Misc hacks to fix up @cachedout's IPC

This was using a mix of blocking and non-blocking calls, which was making a bit of a mess. connect and write are both non-blocking calls on IOStreams, so we either need to handle all the callbacks or do them in the coroutine fashion (much easier to manage). This meant that in the tests your "write" wouldn't make it out since we didn't wait on the connect.

IMO we should refactor this IPC stuff to have proper async interfaces and wrap if absolutely necessary, but I think its reasonable to ask that as part of this we make some more of the core coroutines :)

for #23236

Lint

Remove init of io_loop because we require start()

Various fixes

Remove uneeded functionality

Remove dup

Cleanup and remove unused functions

Moving toward coroutines

More lint

handle_connection changed to spawn

Singletons for ipcclient

Lint disable

Remove redundent check in close()

Remove duplicates in init

Improved exception handling

Test framework

Require sock path to be passed in

Better testing approach

Remove unecessary __init__

Misc cleanup of unecessary methods

Major rework of the IPC channels to make them work :)

Remove TODO, since the feature was implemented

Add more tests for IPC

Add support for reconnecting clients, as well as a return from the IPCServer

misc cleanup

Lint test case

Lint transport
2015-07-14 08:47:09 -06:00
Andreas Lutro
d56efd1341 force arguments to apt_pkg.version_compare into strings
very commonly a float will be passed to the function due to the way module
execution and yaml parsing works. this will throw a TypeError, which will
cause the function to move on to the shell fallback.
2015-07-14 15:52:07 +02:00
Tanky Woo
8044def1c0 file make os.walk only be called one
if a single check have multiple os.walk, such as in _check_directory
function, when there are many files in directory, it will use many time
to generate keep files, if there are some new files between
_gen_keep_files and _check_changes, it will say these files are to be
removed, but in actually, these files in require directory and no need
to removed.
2015-07-14 21:37:01 +08:00
Justin Findlay
d02f388b08 Merge pull request #25395 from rallytime/bp-25389
Back-port #25389 to 2015.5
2015-07-13 21:26:34 -06:00
Justin Findlay
17daf76c0f Merge pull request #25394 from rallytime/bp-25355
Back-port #25355 to 2015.8
2015-07-13 21:26:26 -06:00
Justin Findlay
2b5c2b3b05 Merge pull request #25393 from rallytime/bp-25289
Back-port #25289 to 2015.8
2015-07-13 21:25:34 -06:00
Justin Findlay
008e3295c6 Merge pull request #25392 from rallytime/bp-25256
Back-port #25256 to 2015.5
2015-07-13 21:25:13 -06:00
Justin Findlay
3f278963ae Merge pull request #25398 from twangboy/fix_date
Fix date
2015-07-13 21:21:17 -06:00
Justin Findlay
978d9f7117 Merge pull request #25397 from GideonRed/2015.5
Introduce standard error output when cli exits with non-zero status
2015-07-13 21:20:24 -06:00
Robert James Hernandez
a086e5ad35 Adding entropy note 2015-07-13 16:30:17 -06:00
Kaido Kert
9f1d4ab9b0 EC2 cloud: Fix another availability zone mismatch, preventing cloud.profile state from working correctly 2015-07-13 16:24:06 -06:00
Chris Reeves
49becde5ea Fixing lint error 2015-07-13 16:22:23 -06:00
Chris Reeves
68fef7a976 Comment spelling corrections - thx @jackqu7 2015-07-13 16:22:23 -06:00
Chris Reeves
ffddb940b9 Allow auth basic subscriptions to be checked against existing
subscriptions
2015-07-13 16:22:23 -06:00
Jon Eisen
6b2da4d582 Dont assume source_hash exists
When using file.managed with a source of `file://` and no `source_hash`, this code block can be entered which assumes `source_hash` exists. Here, I add `source_hash` to the `if` statement as a temporary fix. Ideally, we could check for a cached templated file without the need for `source_hash`.
2015-07-13 16:19:12 -06:00
Mike Place
c02ab4d278 Merge pull request #25387 from cachedout/lint_25319
Lint #25319
2015-07-13 15:22:14 -06:00
Mike Place
50ac0e227f Lint #25319 2015-07-13 15:21:31 -06:00
Mike Place
88f4e68622 Merge pull request #25319 from ruzarowski/2015.8-Move-SourceDestCheck-logic-to-_update_enis-to-make-it-work-with-prealloc-enis
[cloud:EC2] Move SourceDest logic to _update_enis and add  alias for delete_interface_on_terminate
2015-07-13 15:19:18 -06:00
Mike Place
09442abbde Merge pull request #25386 from cachedout/lint_25383
Lint #25383
2015-07-13 15:01:10 -06:00
Mike Place
7694299170 Lint #25383 2015-07-13 15:00:24 -06:00
Mike Place
47bcc61f55 Merge pull request #25383 from jahamn/Fix-file.managed_not_handling_dead_symlinks
Fix manage_file function in salt/modules/file.py to handle broken sym…
2015-07-13 14:58:23 -06:00
Mike Place
c9fe10e7aa Merge pull request #25369 from alprs/fix-apt_version_cmp
Fix aptpkg.version_cmp
2015-07-13 14:18:45 -06:00
Mike Place
beb0238392 Merge pull request #25379 from jfindlay/check_wd
check for cwd before getting it
2015-07-13 13:50:27 -06:00
Jason Hamner
ab17aa160e Fix manage_file function in salt/modules/file.py to handle broken symlinks
Fixes #24444 - file.managed does not handle dead symlinks
2015-07-13 13:42:34 -06:00
Mike Place
601607fa81 Merge pull request #25310 from alprs/feature-jinja_is_list
Add an "is list" test to the jinja environment
2015-07-13 12:41:16 -06:00
Justin Findlay
6e4547ff38 check for cwd before getting it
Fixes #25337.
2015-07-13 12:32:55 -06:00
twangboy
52824f9602 Added /V1 /Z to remove scheduled task after run 2015-07-13 11:47:46 -06:00