valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
27,285 Commits 24 Branches 182 Tags 341 MiB
01b6b492ef
Commit Graph

27285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathieu Le Marec - Pasquet
01b6b492ef Safebelts for lxc provisionning: 
Cloud:
    - Allow to use alternate config prefixes
    - Filter default options

LXC module:
    - Filter default options in create
 2014-03-08 22:25:02 +00:00
Mathieu Le Marec - Pasquet
5941827d17 salt.cloud.lxc: Optimized salt client 2014-03-08 22:25:01 +00:00
Joseph Hall
8f8577e336 Merge pull request #11069 from s0undt3ch/hotfix/minor 
Minor corrections
 2014-03-08 05:35:33 -07:00
Pedro Algarvio
ba80b2ecfa Show how to use __virtualname__ 2014-03-08 11:03:20 +00:00
Pedro Algarvio
e26d7f1db9 Update doc to reflect proper __virtual__ usage. 2014-03-08 11:03:07 +00:00
Pedro Algarvio
a88720fec9 Compare to None instead. 
Which is what's returned by `salt.utils.which` in case the binary is not
found.
 2014-03-08 11:02:47 +00:00
Pedro Algarvio
19f1e6fbe8 Merge pull request #11068 from holmboe/survey-runner-index 
Add survey to runner index
 2014-03-08 10:58:30 +00:00
Henrik Holmboe
ec769d4a35 Add survey to runner index 2014-03-08 11:02:33 +01:00
Pedro Algarvio
ea827ecd04 Merge pull request #11067 from gravyboat/develop 
Update to cmd state documentation for a note on creates.
 2014-03-08 09:55:11 +00:00
Forrest Alvarez
0d8ab34bed Merge remote branch 'upstream/develop' into develop 2014-03-08 04:19:33 +00:00
Forrest Alvarez
65e50a4e06 Added a note regarding creates and what versions it is supported in. 2014-03-08 04:19:07 +00:00
Thomas S Hatch
f2ce45263d lint fix 2014-03-07 20:23:34 -07:00
Joseph Hall
312112c4d7 Merge pull request #11066 from techhat/bootstrap 
Don't redefine deploy_script
 2014-03-07 19:50:02 -07:00
Joseph Hall
54dfd1d72b Don't redefine deploy_script 2014-03-07 19:47:33 -07:00
Joseph Hall
4eecbe01ff Merge pull request #11064 from makinacorpus/hotfix3 
fix regression introduced by #11057
 2014-03-07 18:13:42 -07:00
Mathieu Le Marec - Pasquet
dcb288d098 grammar 2014-03-08 01:13:01 +00:00
Mathieu Le Marec - Pasquet
33f86b488a fix regression introduced by #11057 2014-03-08 00:46:12 +00:00
Thomas S Hatch
a73db535aa Another raw string 2014-03-07 16:25:35 -07:00
Thomas S Hatch
dd37d3dcb7 Various lint fixes 2014-03-07 16:24:38 -07:00
Thomas S Hatch
787274f584 Merge pull request #11063 from whiteinge/doc-extension-modules 
Added docs for the extension_modules setting
 2014-03-07 15:18:39 -08:00
Thomas S Hatch
c2bd4906d4 Merge pull request #11062 from basepi/gathertimeout 
Bump default gather_job_timeout to 5 for safety
 2014-03-07 15:18:10 -08:00
Thomas S Hatch
6c922673d3 Merge pull request #11060 from cvrebert/patch-1 
pkgrepo state: add missing import of `sys` module
 2014-03-07 15:17:50 -08:00
Thomas S Hatch
c526e4de44 Merge pull request #11059 from mgwilliams/lxc 
add lxc.saltify and lxc.run_cmd
 2014-03-07 15:17:43 -08:00
Thomas S Hatch
a729a9619b Merge pull request #11058 from hulu/lxc-templates 
avoid shadowing templates() within lxc module
 2014-03-07 15:17:25 -08:00
Thomas S Hatch
7607e44a01 Merge pull request #11057 from hulu/lxc-exists 
shadowing & grammar in lxc module
 2014-03-07 15:17:11 -08:00
Seth House
a06ccfef2f Added docs for the extension_modules setting 
Refs #11030
 2014-03-07 15:13:41 -08:00
Colton Myers
eb139e7c46 Bump default gather_job_timeout to 5 for safety 2014-03-07 15:51:13 -07:00
Chris Rebert
4f39b47a86 pkgrepo state: add missing import of sys module 
************* Module salt.states.pkgrepo
salt/states/pkgrepo.py:303: [E0602(undefined-variable), managed] Undefined variable 'sys'
salt/states/pkgrepo.py:379: [E0602(undefined-variable), absent] Undefined variable 'sys'
 2014-03-07 14:42:10 -08:00
Matthew Williams
de3de02d8d salt.modules.lxc: fix bug in saltify when container is not running 2014-03-07 17:38:35 -05:00
Chris Rebert
43a3dea994 avoid shadowing templates() within lxc module 
************* Module salt.modules.lxc
salt/modules/lxc.py:710: [W0621(redefined-outer-name), templates] Redefining name 'templates' from outer scope (line 700)
 2014-03-07 14:37:04 -08:00
Chris Rebert
29a68727c1 avoid shadowing outer exists() func in lxc module 
************* Module salt.modules.lxc
salt/modules/lxc.py:520: [W0621(redefined-outer-name), start] Redefining name 'exists' from outer scope (line 616)
salt/modules/lxc.py:555: [W0621(redefined-outer-name), stop] Redefining name 'exists' from outer scope (line 616)
 2014-03-07 14:34:03 -08:00
Chris Rebert
22c5bfbeb5 fix grammar in some lxc mod err msgs: exists -> exist 2014-03-07 14:33:40 -08:00
Thomas S Hatch
28f183a71e Fix bad import of glob 2014-03-07 15:22:51 -07:00
Joseph Hall
8f51608e51 Merge pull request #11055 from cvrebert/patch-1 
fix typo in modules.lxc.update_lxc_conf()
 2014-03-07 15:22:29 -07:00
Chris Rebert
4c2a10a234 fix typo in modules.lxc.update_lxc_conf() 
************* Module salt.modules.lxc
salt/modules/lxc.py:870: [E1101(no-member), update_lxc_conf] Instance of 'str' has no 'fomart' member
 2014-03-07 14:19:57 -08:00
Thomas S Hatch
4c6a3c9444 Merge pull request #11053 from cvrebert/patch-1 
fix indentation in salt.output.highstate
 2014-03-07 14:16:46 -08:00
Thomas S Hatch
b37e0b9a89 Merge pull request #11051 from cachedout/10951 
Don't seek on named pipes.
 2014-03-07 14:16:31 -08:00
Thomas S Hatch
161b3f46df Merge pull request #11040 from basepi/servicesfun 
Add `sfun` to service.mod_watch for future compatibility
 2014-03-07 14:14:24 -08:00
Thomas S Hatch
221db9997e Merge pull request #11035 from regilero/fix_immutablelazyproxy 
Fix #11003 TypeError: list/ImmutableLazyProxy on file.accumulated
 2014-03-07 14:13:28 -08:00
Chris Rebert
c2e99a98d8 fix indentation in salt.output.highstate 
************* Module salt.output.highstate
salt/output/highstate.py:126: [W0311(bad-indentation), ] Bad indentation. Found 15 spaces, expected 16
salt/output/highstate.py:130: [W0311(bad-indentation), ] Bad indentation. Found 15 spaces, expected 16
 2014-03-07 14:12:15 -08:00
Thomas S Hatch
9daa9977bd Merge pull request #11034 from JensRantil/less-awkward-check_hash 
Less awkward file.check_hash(...)
 2014-03-07 14:12:00 -08:00
Thomas S Hatch
ae3a58b7e7 Merge pull request #11025 from terminalmage/11001 
Clear available pkgs cache when available packages are likely to have changed
 2014-03-07 14:07:15 -08:00
Thomas S Hatch
790edd07ac Merge pull request #11024 from whiteinge/import_text 
Added load_text filter and import_text tag to Jinja environment
 2014-03-07 14:06:19 -08:00
Thomas S Hatch
4f3d70e41f Merge pull request #11023 from whiteinge/test_exception 
Added exception and stack functions to the test module
 2014-03-07 14:05:16 -08:00
Thomas S Hatch
485112ccd9 Merge pull request #11022 from olliewalsh/issue_11020 
Fix issue 11020
 2014-03-07 14:04:24 -08:00
Thomas S Hatch
ed0779cc9a Merge branch 'easier-writing-runners-doc' of git://github.com/felixhummel/salt into felixhummel-easier-writing-runners-doc 
Conflicts:
	doc/ref/runners/index.rst
 2014-03-07 15:01:18 -07:00
Thomas S Hatch
8c6c608958 Merge branch 'serializers' of git://github.com/johnnoone/salt into johnnoone-serializers 
Conflicts:
	doc/topics/yaml/index.rst
 2014-03-07 14:53:03 -07:00
Thomas S Hatch
bd9473be3b Execution returns route to the master now 2014-03-07 14:51:44 -07:00
Matthew Williams
cf693a3a6c add saltify to salt.modules.lxc 2014-03-07 16:44:26 -05:00
Mike Place
6493c8e28f Don't seek on named pipes. 
Fixes #10951
 2014-03-07 14:35:08 -07:00