valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
76,973 Commits 24 Branches 182 Tags 341 MiB
4e4b3514b4
Commit Graph

76973 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Thrasher
78dd629f09 Fix compat issues with /jobs return values. 
* ensure that both the return and info keys are lists.
* When the Result key doesn't match the expected shape,
  return an empty list of an empty dict (this matches existing
  behavior when looking for a non-existant JID).
 2017-04-12 12:35:22 -06:00
Scott Thrasher
4778bc7365 Speed up /jobs for salt-api when run under cherrypy. 
Currently, if a jid is supplied, two runners are run (both
jobs.lookup_jid and jobs.list_job). This is unnecessary because
the return from jobs.list_job contains all of the information
from jobs.lookup_jid as well.

This change runs only jobs.list_job in this case and builds an
appropriate return from the output, netting an ~ 40% decrease
in response time for this endpoint when a jid is supplied.
 2017-04-12 12:35:22 -06:00
twangboy
825832812b Backport msi-conformant-version function 2017-04-12 12:00:57 -06:00
Mike Place
0638418d22 Merge pull request #40637 from twangboy/fix_unicode_issues 
Add unicode_literals import
 2017-04-12 10:55:02 -06:00
Nicole Thomas
491661f323 Merge pull request #40651 from twangboy/fix_diskusage_py3 
Fix status.diskusage for Windows on Py3
 2017-04-12 10:21:28 -06:00
Nicole Thomas
3aabd85e53 Merge pull request #40631 from gtmanfred/grains 
if grain is defined as None still convert in append
 2017-04-12 10:19:16 -06:00
Erik Johnson
a722ca9ccf archive.extracted: also cleanup fileclient's cached location 
When skip_verify is True, salt doesn't refetch a remote file it already
has in its cache. So, if "keep" is set to False, we need to remove it as
well as the location from file.managed.
 2017-04-12 10:16:18 -05:00
Daniel Wallace
b0bd99c26d add comment and unit test 2017-04-11 21:08:06 -06:00
Mike Place
3737289bee Merge pull request #40629 from aabognah/fix-bug-40167 
Fixing issue # 40167
 2017-04-11 16:45:07 -06:00
twangboy
7c5079ec91 Correct capitalization problem with api call 2017-04-11 16:34:38 -06:00
Mike Place
2a22bea290 Merge pull request #40646 from twangboy/fix_win_network 
Keep network.py execution module
 2017-04-11 16:03:01 -06:00
Nicole Thomas
e1f5a5dfc3 Merge pull request #40645 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-04-11 14:59:13 -06:00
Mike Place
6c4ae3c914 Merge pull request #40642 from DSRCorporation/bugs/40594_ssh_cachedir 
Correctly resolve relative cache path to absolute.
 2017-04-11 14:43:57 -06:00
twangboy
0f7a81cd34 Keep network.py execution module 2017-04-11 14:13:31 -06:00
rallytime
8de6497933 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-04-11 13:41:07 -06:00
Nicole Thomas
2ae9eaa176 Merge pull request #40638 from rallytime/bp-40571 
Back-port #40571 to 2016.3
 2017-04-11 13:36:53 -06:00
Mike Place
8492cef7a5 Merge pull request #40609 from gtmanfred/2016.11 
stat_file when keep is set, instead of mirroring all file permissions
 2017-04-11 12:48:47 -06:00
Dmitry Kuzmenko
055256c518 Correctly resolve relative cache path to absolute. 2017-04-11 21:15:29 +03:00
Erik Johnson
2d1c4be2df pkgrepo.managed: properly handle comments for debian 
Resolves #39778.
 2017-04-11 11:03:32 -06:00
twangboy
021783dbae Add unicode_literals import 2017-04-11 10:34:19 -06:00
Daniel Wallace
b21bc7528f if grain is defined as None still convert in append 
Fixes #40624
 2017-04-11 09:45:16 -06:00
Mike Place
05ac613ecf Merge pull request #40620 from mateiw/2016.11-suse-saltapi-service 
SUSE specific changes to salt-api.service
 2017-04-11 08:44:59 -06:00
Anas Abognah
28f7744cb6 Fixing issue # 40167 with file.replace where the diff output does not 
display correctly.
 2017-04-11 10:26:12 -04:00
Matei Albu
ee911a74b4 suse specific changes to salt-api.service 
* run service under user salt
 * change type from notify to simple
 * set SHELL env var. When passing a ProxyCommand option to salt-ssh a valid $SHELL is needed execute the given command
 2017-04-11 09:19:23 +02:00
Mike Place
b0a2414d68 Merge pull request #40614 from gtmanfred/tcp 
add retries on authentications of the salt minion reconnecting
 2017-04-10 16:42:16 -06:00
Mike Place
f7e121a9ee Merge pull request #40606 from kaszuba/fix-dockerng-sls 
Use correct exec_driver in dockerng.sls module
 2017-04-10 16:25:30 -06:00
Mike Place
b6cf948afe Merge pull request #40615 from rallytime/fix-39863 
Call out to _pki_minions() once, rather than in a loop in _check_list_minions()
 2017-04-10 16:22:17 -06:00
rallytime
1a9f03ab92 Call out to _pki_minions() once, rather than in a loop in _check_list_minions() 
Fixes #39863
 2017-04-10 15:09:58 -06:00
Daniel Wallace
a86b101ae6 add retries on authentications of the salt minion reconnecting 2017-04-10 14:53:26 -06:00
Daniel Wallace
6e34c2b5e5 stat file when placing it on server instead of caching 
remove chmod of files in the fileserver
add stat_file to cp module
use cp.stat_file to get file mode in file module
add a note about keep not working with ssh
 2017-04-10 13:03:04 -06:00
Erik Johnson
5ea1f607b0 Fix mocking in unit tests 2017-04-10 13:57:39 -05:00
Erik Johnson
8dfa51f31f Moar fixes for source_hash_update 
This commit adds additional fixes make source_hash_update work as
expected.
 2017-04-10 13:54:55 -05:00
Artur Kaszuba
3a0d61f108 Use correct exec_driver in dockerng.sls module 
This change allow to execute dockerng.sls module with correct
docker exec_driver.
 2017-04-10 15:55:48 +02:00
Mike Place
4fa58be222 Merge pull request #40588 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-04-07 13:30:13 -06:00
rallytime
5a419b8aae Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/pillar.py
 2017-04-07 11:23:41 -06:00
Erik Johnson
7103707d49 Remove unnecessary versionadded lines 
There's already one at the top of the function's docstring.
 2017-04-07 10:42:39 -05:00
Nicole Thomas
3d07f637ca Merge pull request #40575 from rallytime/bp-40559 
Back-port #40559 to 2016.11
 2017-04-07 09:42:25 -06:00
Nicole Thomas
9041ca2ba5 Merge pull request #40576 from rallytime/bp-40573 
Back-port #40573 to 2016.11
 2017-04-07 09:20:10 -06:00
Erik Johnson
f8bc423ef9 Merge pull request #40563 from terminalmage/merge-2016.3-2016.11 
Merge-forward 2016.3 -> 2016.11
 2017-04-07 10:08:19 -05:00
Erik Johnson
0c608d7417 Add client_args_mock back to test 
I removed this incorrectly in resolving a merge conflict.
 2017-04-07 08:50:45 -05:00
Arda Kuyumcu
12180808ee Fix typo in IAM state for managed policies 2017-04-06 17:34:23 -06:00
jinm
8280e5256e Fix v3 for https://github.com/saltstack/salt/issues/38472 2017-04-06 17:33:09 -06:00
Mike Place
fd757fffa3 Merge pull request #40571 from terminalmage/issue39778 
pkgrepo.managed: properly handle comments for debian
 2017-04-06 15:55:45 -06:00
Mike Place
83f6d3d3bb Merge pull request #40567 from terminalmage/fix-pillar-get-merge-lists 
Allow pillar.get to merge list as well as dictionaries
 2017-04-06 15:54:16 -06:00
Mike Place
b1698e830e Merge pull request #40572 from rallytime/fix-40278 
Clean out kwargs dict in cloud.action before calling cloud driver function
 2017-04-06 15:53:39 -06:00
Mike Place
62d8ad2b4b Merge pull request #39882 from smarsching/issue-39842 
Fix handling of trailing newlines on Windows
 2017-04-06 15:12:24 -06:00
rallytime
c978486452 Clean out kwargs dict in cloud.action before calling cloud driver function 
Fixes #40278

When we run a cloud.action function from the CLI, the various __pub_* keys
and values populate the "kwargs" arg. Then, when we attempt to call out
to a cloud driver's function that doesn't accept a "kwarg" arg (or there are
too many args passed now), we get an error.

If the cloud function only takes "name" and "call", we should not be passing
in "kwargs", too.
 2017-04-06 14:29:03 -06:00
Erik Johnson
191610482d pkgrepo.managed: properly handle comments for debian 
Resolves #39778.
 2017-04-06 15:24:38 -05:00
Nicole Thomas
ae13de622a Merge pull request #40451 from isbm/isbm-fileclient-testcase-2016.11 
Fileclient testcase (2016.11)
 2017-04-06 13:53:30 -06:00
Mike Place
a8304cd5a1 Merge pull request #40552 from terminalmage/fix-hash-type-refs 
Don't use __opts__.get() for hash_type
 2017-04-06 12:27:31 -06:00