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
34,338 Commits 24 Branches 182 Tags 341 MiB
6e575491ee
Commit Graph

34338 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
6e575491ee Merge pull request #14506 from whiteinge/netapi-client-config 
Load netapi modules using client config instead of master config
 2014-07-25 15:49:02 -06:00
Thomas S Hatch
4d6af812ff Merge pull request #14507 from whiteinge/salt-jinja-utils 
Added utils-style IP-check functions to the network module
 2014-07-25 15:48:56 -06:00
Seth House
ac6c7d0d6d Added utils-style IP-check functions to the network module 2014-07-25 15:20:14 -06:00
Seth House
c046f1cac7 Revert "Switch NetapiClient to use client_config instead of master_config" 
This partially reverts commit 2bc1ed8afb.
 2014-07-25 14:42:19 -06:00
Seth House
fd393f4a48 Load netapi modules using client config instead of master config 2014-07-25 14:12:48 -06:00
Thomas S Hatch
db5e572760 Merge pull request #14269 from whiteinge/test-dotlookup-notation 
Add a bug fix plus tests for calling functions in Jinja via dot-lookup notation
 2014-07-25 14:04:03 -06:00
Nicole Thomas
0674839ecd Merge pull request #14495 from cro/rhel7_pkgtests2 
Extend dot-in-pkg test to RHEL 5 as well
 2014-07-25 12:55:09 -06:00
Thomas S Hatch
023d123773 Merge pull request #14498 from whiteinge/doc-gpg-renderer-code-blocks 
Fixed code-block directives in gpg renderer
 2014-07-25 12:52:27 -06:00
C. R. Oldham
253de7a995 PyLint fix. 2014-07-25 12:48:07 -06:00
Seth House
0d8cc41c61 Added tests for calling functions via Jinja with dot-lookup syntax 
Yay!
 2014-07-25 12:27:45 -06:00
Seth House
5fdd866d12 Switch __salt__ to use the dot-lookup subclass 2014-07-25 12:27:45 -06:00
Seth House
2d8615c805 Added a dictionary subclass that supports dot-lookup notation 2014-07-25 12:27:45 -06:00
Seth House
2f97110ca8 Fixed code-block directives in gpg renderer 2014-07-25 12:02:14 -06:00
C. R. Oldham
f53e477735 Merge commit, resolve conflict 2014-07-25 11:16:22 -06:00
C. R. Oldham
89f115b25d Merge commit 2014-07-25 11:05:20 -06:00
C. R. Oldham
c94808689d Extend dot-in-pkg test to RHEL 5 as well 2014-07-25 10:57:18 -06:00
Thomas S Hatch
3fdf39134d Merge pull request #14490 from rallytime/tls_cli_examples 
Added CLI examples to tls functions that were missing them
 2014-07-25 10:46:45 -06:00
Thomas S Hatch
831021fe6a Merge pull request #14493 from thatch45/2014.7 
Merge #14475 with lint fixes
 2014-07-25 10:41:20 -06:00
Thomas S Hatch
84971cba7d Merge branch 'cro-rhel7_pkgtests' into 2014.7 2014-07-25 10:40:06 -06:00
Thomas S Hatch
288e9bba29 TABS?!?!? Really @cro ?? 2014-07-25 10:39:19 -06:00
Thomas S Hatch
35c3614f7f Merge branch 'rhel7_pkgtests' of https://github.com/cro/salt into cro-rhel7_pkgtests 2014-07-25 10:38:10 -06:00
rallytime
cb5b9d48c9 Added CLI examples to tls functions that were missing them 2014-07-25 10:23:14 -06:00
Thomas S Hatch
0a13fa6ea5 Merge pull request #14489 from thatch45/2014.7 
lint fix
 2014-07-25 10:22:14 -06:00
Thomas S Hatch
0577b4070b lint fix 2014-07-25 10:21:31 -06:00
Thomas S Hatch
f3e6841401 Merge pull request #14452 from s0undt3ch/hotfix/osx-pyt-nr 
Skip test on Darwin after making an effort
 2014-07-25 10:20:10 -06:00
Thomas S Hatch
14159615c8 Merge pull request #14268 from whiteinge/salt-runner-sync-async 
Add sync/async Runner calls & sync/async Wheel calls that all respect eauth
 2014-07-25 10:07:54 -06:00
Joseph Hall
f60063b6d8 Merge pull request #14487 from s0undt3ch/hotfix/transifex-updates 
Update 'doc/.tx/config' - Build #123
 2014-07-25 08:58:28 -06:00
Pedro Algarvio
4fa7d3ad64 Update 'doc/.tx/config' - Build #123 
http://cookingwithsalt.org/job/salt/job/transifex/123/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-07-25 15:57:15 +01:00
C. R. Oldham
1891b07856 Make this test check for diff packages on RHEL/Centos 6 vs 7 2014-07-24 19:11:56 -04:00
C. R. Oldham
b6f70ac80f Make this test check for diff packages on RHEL/Centos 6 vs 7 2014-07-24 19:09:52 -04:00
Seth House
73d798c117 Added timeouts to the Runner/Wheel sync calls 2014-07-24 16:19:40 -06:00
Seth House
bf9128362e Use WheelClient instead of the deprecated Wheel 2014-07-24 16:08:31 -06:00
Seth House
2bc1ed8afb Switch NetapiClient to use client_config instead of master_config 
We access the Salt master through client interfaces and should use the
correct config when doing so. We should also reuse the already-loaded
opts when instantiating LocalClient().
 2014-07-24 16:08:31 -06:00
Seth House
33043ef919 Added NetapiClient integration tests 2014-07-24 16:08:31 -06:00
Seth House
1bb29bd111 Add runner_async and wheel_async clients to NetapiClient 
Also switch from master_call to new public-facing methods.
 2014-07-24 16:08:30 -06:00
Seth House
bd72c35f7c Add tests for the cmd_sync and cmd_async RunnerClient methods 2014-07-24 16:08:30 -06:00
Seth House
c34cddcfbb Move eauth_creds to class-level for reuse 2014-07-24 16:08:30 -06:00
Seth House
b077b2436e Add 'auto' eauth backend for tests 2014-07-24 16:08:30 -06:00
Seth House
a4cc496bc7 Renamed call_func to cmd for consistency; made compat alias 
Added WheelClient() documentation on the non-eauth cmd & async funcs.
 2014-07-24 16:08:30 -06:00
Seth House
7f147e1212 Added cmd_sync, cmd_async methods to WheelClient docs 2014-07-24 16:08:29 -06:00
Seth House
4404bc0f7f Added function to execute WheelClient() functions asynchronously 2014-07-24 16:08:29 -06:00
Seth House
7aad94b5fe Refactored WheelClient() to use sync/async mixin classes 2014-07-24 16:08:29 -06:00
Seth House
b98754787c Added a cmd_sync method to WheelClient 
This matches the behavior and semantics of the RunnerClient() method of
the same name.
 2014-07-24 16:08:29 -06:00
Seth House
fa168828dc Refactored RunnerClient to use sync/async mixin classes 2014-07-24 16:08:28 -06:00
Seth House
aa40d6af4d Added two mixin classes, copied from RunnerClient, for executing funcs 2014-07-24 16:08:28 -06:00
Seth House
6e40307efc Document new cmd_sync, cmd_async RunnerClient methods 
Also de-emphasize the direct master_call method. Since master_call is
inconsistent between RunnerClient and WheelClient we should instead
present a single, consistent interface.
 2014-07-24 16:08:28 -06:00
Seth House
35833ab294 Add cmd_sync and cmd_async methods to RunnerClient() 2014-07-24 16:08:27 -06:00
Seth House
75540a657d Return the jid as well in the RunnerClient.async() return 2014-07-24 16:08:27 -06:00
Pedro Algarvio
e8c4de761f Merge pull request #14472 from whiteinge/new-doc-modules 
Added docs for new module additions
 2014-07-24 23:02:31 +01:00
Pedro Algarvio
8154671497 Merge pull request #14466 from cro/rhel7_pkgtests 
Fix two RHEL7 tests
 2014-07-24 22:59:18 +01:00