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

59965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
4a6b53f329 Merge pull request #30268 from terminalmage/issue9569 
Optimize file_tree ext_pillar and update file.managed to allow for binary contents
 2016-01-12 13:09:19 -07:00
Mike Place
dbe7bcdc9a Merge pull request #30245 from rallytime/botosecgroup-docs 
Boto secgroup/iam_role: Add note stating us-east-1 is default region
 2016-01-12 13:04:31 -07:00
Mike Place
6b183778f1 Merge pull request #30299 from rallytime/esxi-proxy-doc-fix 
ESXi Proxy minions states are located at salt.states.esxi, not vsphere.
 2016-01-12 13:03:31 -07:00
Mike Place
903289d3fb Merge pull request #30202 from Unity-Technologies/hotfix/beacon_periodic 
Fixed the periodic call to beacons
 2016-01-12 12:58:44 -07:00
Mike Place
48d2bd9e78 Merge pull request #30303 from jacobhammons/pcre-match 
Changed notes to indicate that functions are matched using regular ex…
 2016-01-12 12:15:16 -07:00
Mike Place
675ac4b43f Merge pull request #30284 from terminalmage/issue29684 
salt.utils.gitfs: Fix Dulwich env detection and submodule handling
 2016-01-12 12:11:36 -07:00
Mike Place
8f65e822d7 Merge pull request #30280 from jfindlay/state_mock_doc 
add state mocking to release notes
 2016-01-12 12:10:40 -07:00
Mike Place
c9ade42d10 Merge pull request #30273 from rallytime/bp-30121 
Back-port #30121 to 2015.8
 2016-01-12 12:10:16 -07:00
Jacob Hammons
e5079ab4c9 Changed notes to indicate that functions are matched using regular expressions instead of minions 2016-01-12 11:55:36 -07:00
Mike Place
3a5a84a790 Merge pull request #30301 from cachedout/fix_state_tests 
Accept whatever comes into hightstate mock for state tests
 2016-01-12 11:33:13 -07:00
Mike Place
2c62b464b1 Accept whatever comes into hightstate mock for state tests 2016-01-12 11:30:25 -07:00
Mike Place
8438d19815 Merge pull request #30282 from cachedout/fix_30156 
Fix file.append logic
 2016-01-12 11:27:30 -07:00
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
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
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
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
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
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
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
Mads R. Christensen
c8c30f2105 I fail at linting... Fixed my uppercase/lowercase problem 2016-01-11 11:36:54 -07:00
MadsRC
0877b33026 Fixed some linting issues 2016-01-11 11:36:54 -07:00
Mads R. Christensen
8ec36497a1 Added note about systemd and uncleanshutdown. Also fixed line lenght of comments to max 80 characters as per PEP0008 2016-01-11 11:36:54 -07:00
Mads R. Christensen
a50428d02c On an unclean shutdown, if oncleanshutdown is given a path, an keyy:value of shutdown:unclean is added to the returned data. The documentation states that the key should be 'uncleanshutdown' and that the value should either be True or False. This is fixed in the code 2016-01-11 11:36:54 -07:00
Mads R. Christensen
51b57f1820 Fixed issue number #30117 - When no parameters are given to a service, the service object is of type None and thus isn't iterable. This is contrary to the documentation which states that there are default values. Default values added as False 2016-01-11 11:36:54 -07:00