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
64,385 Commits 24 Branches 182 Tags 341 MiB
39b49621ad
Commit Graph

64385 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
530c9ec6ec Merge pull request #30289 from cro/proxy_grains_fix 
Fix problems with targeting proxies by grains
 2016-01-12 11:16:57 -07:00
C. R. Oldham
8362d76440 Add comments. 2016-01-12 11:15:30 -07:00
rallytime
db68fc48a8 Fix CLI Example syntax 2016-01-12 11:06:04 -07:00
Mike Place
75b83453cf Merge pull request #30293 from cro/proxy_log_cleanup 
Ensure we don't log stuff we shouldn't
 2016-01-12 11:04:25 -07:00
twangboy
274e66f624 Made changes for better unicode handling 2016-01-12 10:56:19 -07:00
C. R. Oldham
8ce565fad9 Merge pull request #30294 from techhat/safeload 
YAML should always use safe_load.  Merging because failing tests are the boto ones and are not related.
 2016-01-12 10:37:54 -07:00
rallytime
1cb9f29798 ESXi Proxy minions states are located at salt.states.esxi, not vsphere. 2016-01-12 10:37:29 -07:00
C. R. Oldham
4e50962642 Merge branch 'proxy_grains_fix' of github.com:cro/salt into proxy_grains_fix 2016-01-12 10:12:13 -07:00
C. R. Oldham
8fd8f3beb7 Lint. 2016-01-12 10:11:43 -07:00
C. R. Oldham
144fea02e5 Force a grains sync after we load the proxy's grains. 2016-01-12 10:11:43 -07:00
C. R. Oldham
5ecf85017b Disallow non-proxyenabled modules and grains 2016-01-12 10:11:43 -07:00
C. R. Oldham
b358fe370c Merge remote-tracking branch 'origin/proxy_log_cleanup' into proxy_log_cleanup 2016-01-12 10:09:28 -07:00
C. R. Oldham
3267d92216 Add unused 'output_loglevel' kwarg. This is here for when we alias cmd.run_all directly to _run_all_quiet in certain chicken-and-egg situations where modules need to work both before and after the __salt__ dictionary is populated (cf dracr.py). 2016-01-12 10:08:55 -07:00
C. R. Oldham
6a86bdc6da Ensure we don't log stuff we shouldn't. 2016-01-12 10:08:55 -07:00
Mike Place
46681658e0 Merge pull request #30279 from cachedout/boto_pack 
Allow modules to be packed into boto utils
 2016-01-12 09:53:54 -07:00
Mike Place
3f633ff15e Lint 2016-01-12 09:53:03 -07:00
C. R. Oldham
c9a5680427 Add unused 'output_loglevel' kwarg. This is here for when we alias cmd.run_all directly to _run_all_quiet in certain chicken-and-egg situations where modules need to work both before and after the __salt__ dictionary is populated (cf dracr.py). 2016-01-12 09:42:48 -07:00
twangboy
b5a9f06669 Refactored and added missing CLI examples 2016-01-12 09:42:18 -07:00
Joseph Hall
a4ecda25d5 YAML should always use safe_load 2016-01-12 08:54:32 -07:00
C. R. Oldham
61bb6a9a14 Lint. 2016-01-12 08:48:05 -07:00
C. R. Oldham
8c46de12e4 Ensure we don't log stuff we shouldn't. 2016-01-12 08:47:01 -07:00
Erik Johnson
59bf118ef7 Merge pull request #30197 from robgott/states.git.detached 
add git.detached state
 2016-01-12 09:40:47 -06:00
C. R. Oldham
7c35333509 Force a grains sync after we load the proxy's grains. 2016-01-12 08:06:33 -07:00
C. R. Oldham
2855ba7da5 Disallow non-proxyenabled modules and grains 2016-01-12 07:53:09 -07:00
Nitin Madhok
b0e86afa00 get_mor_by_property needs container_ref to be a positional parameter 2016-01-12 08:58:31 -05:00
twangboy
b10c9a37d2 Fixed more lint 2016-01-12 06:43:20 -07:00
Alkivi
b3a9274277 fix some lint errors 2016-01-12 13:45:10 +01:00
Jorge Schrauwen
fd0243f288 docs 2016-01-12 08:37:42 +00:00
Alkivi
3579ad4e48 fix some lint error 2016-01-12 08:52:59 +01:00
Erik Johnson
a746014f7e salt.utils.gitfs: Fix Dulwich env detection and submodule handling 
I broke this in dae738f. I mistakenly thought I saw both head refs and
remote refs in the fetch results, so by consolidating the code that
resolves refnames into environment names I ensured that the head refs
which were fetched would never be seen as fileserver environments.

This commit fixes #29684 by converting the names of the fetched head
refs to remote refs. Corresponding changes were also made to the
get_tree() function (as the refnames are now different).

Additionally, I discovered that Dulwich does not track information about
submodules, resulting in a KeyError when compiling a list of files. This
is the same issue that also affected Pygit2 and was fixed in 8c4ea64.
I've made a similar fix for it here.
 2016-01-11 22:40:09 -06:00
twangboy
d5a9943e27 Fixed some lint, unused imports 2016-01-11 18:31:48 -07:00
twangboy
67e44b162a Put colon in the wrong place 2016-01-11 18:30:11 -07:00
twangboy
a234d6c12c Fixed missing colons in if statements 2016-01-11 18:28:24 -07:00
Rob Gott
ca0c8ef5f4 add git.detached state 2016-01-12 10:51:48 +10:00
twangboy
06b1aba45b Added documentation to new functions 2016-01-11 17:38:57 -07:00
Mike Place
11d27ba694 Mock config module in utils test 2016-01-11 16:31:21 -07:00
Mike Place
99dd11dec2 Remove debugging 2016-01-11 16:20:12 -07:00
Mike Place
35ef585c54 Fix logic error in file.append 
The conditional in #31056 was incorrectly written. This properly nests the check for the ignore_whitespace flag.
 2016-01-11 16:17:15 -07:00
Erik Johnson
724b2f36ce Add file_tree/file.managed/contents_pillar example to FAQ 2016-01-11 16:45:56 -06:00
Erik Johnson
854c7d9978 Remove old FAQ item referencing gitfs bug in 0.16.x 
This release has been EOL for a long time, and is not even available
from pretty much any distro. It is safe to remove this item.
 2016-01-11 16:45:56 -06:00
Erik Johnson
e9a6d709f9 salt.states.file.managed: Allow for binary contents 
This allows for binary contents to be used in file.managed when either
contents, contents_pillar, or contents_grains is used. Prior to this
commit, these options treated all of these options as only having string
data.

Additionally, documentation for this and a couple other states has been
improved.
 2016-01-11 16:45:56 -06:00
Erik Johnson
1ba448b619 salt.pillar.file_tree: Optimizations, deprecate raw_data 
This modifies this ext_pillar to read in the file file_buffer_size bytes
at a time. It also removes needlessly duplicated code for dictionary
merging with salt.utils.dictupdate.merge().

Finally, the 'raw_data' argument is poorly-named and does not describe
very well what it actually does, so I have renamed this option to
'keep_newline'.
 2016-01-11 16:45:56 -06:00
Erik Johnson
650cc0af5c salt.modules.file: Improve docstrings 
This also changes a few exceptions to match common usage (passive voice
instead of imperative).
 2016-01-11 16:45:56 -06:00
Mike Place
62a1818287 Lint 2016-01-11 14:57:16 -07:00
Sergey Maranchuk
8bf7cf65ad re #26070: fix custom grains in salt-ssh 2016-01-11 23:53:51 +02:00
Justin Findlay
22c1129f02 modules.state.sls,highstate: mock versionadded 2016-01-11 14:29:00 -07:00
Justin Findlay
934de30939 add state mock to 2015.8.4 release notes 2016-01-11 14:24:51 -07:00
Mike Place
cf440036dd Remove unused import 2016-01-11 14:14:50 -07:00
Mike Place
36d55ea0ad Allow modules to be packed into boto utils 
A workaround to allow modules to be packed into the namespace for the boto utils.
 2016-01-11 14:13:07 -07:00
Michele Preziuso
d6e6e10534 Fixes lint issues 2016-01-11 21:02:32 +00:00