valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
58,540 Commits 24 Branches 182 Tags 341 MiB
cfadda0c0c
Commit Graph

58540 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
2491ce40f1 Merge pull request #27705 from rallytime/merge-27602 
Merge #27602 with final pylint fix
 2015-10-05 17:36:50 -06:00
rallytime
81aad83386 Ignore import error 2015-10-05 17:35:31 -06:00
Jacob Hammons
1c51ce28a9 Update compound matcher docs to clarify the usage of alternate delimiters 
Refs #26604
 2015-10-05 17:29:39 -06:00
Colton Myers
fadb954676 Use new method for injecting globals into state functions 2015-10-05 17:07:45 -06:00
Colton Myers
17b267470a Add decorator for injecting globals into functions in the loader 
Override LazyLoader __getitem__ to wrap the function if globals are
defined for wrapping
 2015-10-05 17:06:40 -06:00
Joseph Hall
b76eb08c68 Merge pull request #27691 from notpeter/iam_fail_faster 
Faster timeout (3s vs 2min) for instance metadata lookups. #13850.
 2015-10-05 16:55:52 -06:00
C. R. Oldham
fc78f49dc5 Merge pull request #27696 from blueyed/load-proxy-call-_module_dirs-only-once 
loader.proxy: call `_modules_dirs` only once
 2015-10-05 16:42:32 -06:00
Daniel Hahler
561dc4cf94 dockerng: fix/enhance version warning in __virtual__ 
Currently the call to `log.warning` will throw an error, because
`str.join` expects strings, not numbers.

This commit fixes it and also handles a mismatching docker-py version
more appropriate by returning a tuple instead of logging warnings
(hinted via https://github.com/saltstack/salt/pull/27602#discussion_r41057751).
 2015-10-06 00:20:26 +02:00
Colton Myers
43fba89865 Merge pull request #27695 from rallytime/bp-27671 
Back-port #27671 to 2015.5
 2015-10-05 15:57:36 -06:00
Colton Myers
77516912fa Merge pull request #27630 from ticosax/include-container-id-docker-mine 
Expose container_id in mine.get_docker
 2015-10-05 15:56:53 -06:00
Colton Myers
8453cb3eb1 Merge pull request #27600 from blueyed/dockerng-auto-version 
dockerng: use docker.version=auto by default
 2015-10-05 15:29:14 -06:00
Colton Myers
cb3d92676e Merge pull request #27524 from jfindlay/pkgng_quiet 
parse pkgng output in quiet mode for >= 1.6.1
 2015-10-05 15:22:40 -06:00
Colton Myers
5b88c55cc3 Merge pull request #27686 from rallytime/bp-27476 
Back-port #27476 to 2015.5
 2015-10-05 15:17:59 -06:00
Colton Myers
f9ddd4647f Merge pull request #27684 from rallytime/bp-27656 
Back-port #27656 to 2015.5
 2015-10-05 15:17:55 -06:00
Colton Myers
7a4291008e Merge pull request #27689 from rallytime/fix-tests-27448 
Merge #27448 with test fixes
 2015-10-05 15:17:41 -06:00
Colton Myers
7ca6f854ff Merge pull request #27683 from rallytime/bp-27659 
Back-port #27659 to 2015.5
 2015-10-05 15:17:30 -06:00
Colton Myers
a0f3e34656 Merge pull request #27682 from rallytime/bp-27566 
Back-port #27566 to 2015.5
 2015-10-05 15:17:26 -06:00
Colton Myers
0b9ba911c4 Merge pull request #27681 from rallytime/bp-25928 
Back-port #25928 to 2015.5
 2015-10-05 15:17:19 -06:00
Colton Myers
23da0d316a Merge pull request #27680 from rallytime/bp-27535 
Back-port #27535 to 2015.5
 2015-10-05 15:17:10 -06:00
Daniel Hahler
55a76be6c1 loader.proxy: call _modules_dirs only once 
Instead of assigning it to an unused variable, pass the function's
return value to LazyLoader directly.
 2015-10-05 23:07:40 +02:00
Aditya Kulkarni
497f965c33 Comment 2015-10-05 17:06:44 -04:00
Nicole Thomas
4ddc87157a Merge pull request #27693 from jacobhammons/doc-updates 
initial engines topic, updates to windows repo docs
 2015-10-05 15:05:26 -06:00
Jacob Hammons
5a3e72fc8e __ops__ to __opts__ 2015-10-05 15:00:56 -06:00
Oleg Gashev
2a88028595 Added skip test_ext_pillar_env_mapping if git module does not exist. 
If module named git does not exist, test test_ext_pillar_env_mapping
fail:

======================================================================
ERROR: test_ext_pillar_env_mapping
(integration.modules.pillar.PillarModuleTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/opt/git/salt/tests/integration/modules/pillar.py", line 120, in
test_ext_pillar_env_mapping
    import git
ImportError: No module named git

Added skip test_ext_pillar_env_mapping test.
 2015-10-05 14:47:25 -06:00
Nicole Thomas
f7f48d1eef Merge pull request #27601 from blueyed/dockerng-none-names 
dockerng: handle None in container.Names
 2015-10-05 14:32:19 -06:00
Aditya Kulkarni
8ad7082913 Add example beacon that works with salt-proxy 2015-10-05 16:23:58 -04:00
Jacob Hammons
5a9867aad1 initial engines topic, updates to windows repo docs 
Refs #23239
Refs #27520
 2015-10-05 14:22:59 -06:00
Erik Johnson
3ffb5a3369 Merge pull request #27596 from blueyed/fix-gitfs-UnboundLocalError 
gitfs: fix UnboundLocalError for 'msg'
 2015-10-05 15:18:00 -05:00
rallytime
05a506ec9f Use correct comment in test 2015-10-05 14:02:13 -06:00
Peter Tripp
3d9483b4e2 Faster timeout (3s vs 2min) for instance metadata lookups. #13850. 2015-10-05 12:17:59 -07:00
rallytime
8296fefb31 Merge #27448 with test fixes 2015-10-05 12:33:03 -06:00
Nicole Thomas
d284eb165b Merge pull request #27390 from JaseFace/schedule-missing-enabled 
Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item()
 2015-10-05 12:09:33 -06:00
Nicole Thomas
7d7b97eab6 Merge pull request #27442 from JaseFace/fix-27391-for-2015.5 
Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item()
 2015-10-05 12:01:29 -06:00
Dennis Harper
3e08d3de8a fix for: https://github.com/saltstack/salt/issues/27373 
Setup::DownloadWindowsDlls is downloading and writing the file as
a text not a binary file.

When creating the file handle to write the binary after being download from salt's
dependency repo, the file handle was being created with just the 'write' attribute,
however it also needs the 'binary' attribute.

Change-Id: I2f67d27ee847cd7808a78cd5ec0b2151d6a0c0e7
 2015-10-05 11:51:29 -06:00
Georges Racinet
d3780cba00 Fix #27655: handling of success in postgres_local_cache 
- using get() is anyway more pythonic
- psycopg2 translates None to NULL
- moving explanation to schema comment

(there's no existing unit test for this)
 2015-10-05 11:43:56 -06:00
Gary Wright
84b6ee0c58 .pub as public key is what we should send to remote 2015-10-05 11:40:55 -06:00
Daniel Hahler
2a44255748 minor: fix/format doc for returners.local_cache.prep_jid 2015-10-05 11:39:08 -06:00
Daniel Hahler
fd485e2396 returners.local_cache: fix endless loop on OSError 
I was getting a "Permission denied" OSError when running as a non-root
user, from the example provided at
https://docs.saltstack.com/en/latest/ref/runners/all/salt.runners.pillar.html#salt.runners.pillar.show_pillar:

    import salt.config
    import salt.runner
    opts = salt.config.master_config('/etc/salt/master')
    runner = salt.runner.RunnerClient(opts)
    pillar = runner.cmd('pillar.show_pillar')
    print(pillar)

This patch passes on the increased `recurse_count` argument, so it will
eventually abort after 5 retries.
 2015-10-05 11:39:08 -06:00
Mike Place
17e1ddf137 Fix stacktrace for non-existant states 
Closes #25813
 2015-10-05 11:30:36 -06:00
rallytime
04aed5e105 Versionadded change since 2015.5.6 has already been tagged 2015-10-05 11:17:49 -06:00
Julien Cigar
579f2646ba .. versionadded:: 2015.5.6 2015-10-05 11:16:59 -06:00
Julien Cigar
cbaf46e066 python <2.7 compability (pylint issue) 2015-10-05 11:16:59 -06:00
Julien Cigar
ecde499478 s/bin/b to avoid confusion with bin() 2015-10-05 11:16:59 -06:00
Julien Cigar
4237c5db80 add a __virtual__ to check that daemontools is installed properly 2015-10-05 11:16:58 -06:00
Julien Cigar
623935a1bc fix doc 2015-10-05 11:16:58 -06:00
Julien Cigar
573de3abd6 fix pylint issue 2015-10-05 11:16:58 -06:00
Julien Cigar
5eb6a30d40 fix pep8 issues 2015-10-05 11:16:58 -06:00
Julien Cigar
298cf4f5c0 import missing logging module 2015-10-05 11:16:58 -06:00
Julien Cigar
fe0ad36609 log was missing 2015-10-05 11:16:58 -06:00
Julien Cigar
e457083465 s/systemd/FreeBSD 2015-10-05 11:16:58 -06:00