valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
19,204 Commits 24 Branches 182 Tags 341 MiB
859804b689
Commit Graph

19204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
e905ab2ef3 Add new ports state 2013-10-16 23:50:12 -05:00
Erik Johnson
1ba87c96a7 Enhancements to freebsdports execution module 
This adds a flag to showconfig that allows you to see the default
build options for a given port, as well as adds two new functions,
"list_all" and "search".
 2013-10-16 23:50:12 -05:00
Erik Johnson
896c3cf7f2 Move dict repacking function to salt.utils 
This allows the same repacking that is used in package management to be
used for lists of key/value pairs passed to ports.installed states.
 2013-10-16 23:50:12 -05:00
Thomas S Hatch
6114f1b07a Skip sls refs that have already been loaded while evaluating the 
Top level matches
 2013-10-16 22:04:20 -06:00
Thomas S Hatch
c94f4bde01 pylint fix for fileserver routine 2013-10-16 17:50:30 -06:00
Thomas S Hatch
9b97729767 Merge pull request #7899 from cachedout/develop 
Fix logical condition which was breaking useradd.
 2013-10-16 16:35:35 -07:00
Mike Place
5206cd9065 Fix logical condition which was breaking useradd. 2013-10-16 17:28:48 -06:00
David Boucha
2be17f9f29 Merge pull request #7898 from ze42/develop 
fileserver.*_list*: ensure prefix filtering
 2013-10-16 15:56:51 -07:00
Pedro Algarvio
9181ac81b9 Update the alternatives mocked unit tests to the new python_shell argument to cmd. 2013-10-16 23:43:27 +01:00
Adrien "ze" Urban
3a76f55774 fileserver.*_list*: ensure prefix filtering 
Should fix #7404
 2013-10-17 00:29:49 +02:00
Pedro Algarvio
db670d1357 Don't fail if process already killed. 2013-10-16 23:27:19 +01:00
Thomas S Hatch
7b8cd29e97 Clean out extra line 2013-10-16 16:06:41 -06:00
Thomas S Hatch
6a610679a5 Merge pull request #7897 from s0undt3ch/features/func-aliases-doc-fix 
Properly render aliased salt function names. Fixes #7885.
 2013-10-16 14:59:04 -07:00
Thomas S Hatch
2ef8da67be Merge pull request #7896 from basepi/pillarget7566 
Add note about pillar.get() vs salt['pillar.get']() in templates
 2013-10-16 14:58:43 -07:00
Thomas S Hatch
5ce7e17e97 Merge pull request #7895 from UtahDave/fix_args 
use python_shell=False to improve module security
 2013-10-16 14:58:27 -07:00
Pedro Algarvio
99bcf207d0 Properly render aliased salt function names. Fixes #7885. 2013-10-16 22:52:56 +01:00
Colton Myers
c4dde69a2f Add note about pillar.get() vs salt['pillar.get']() in templates, Fix #7566 2013-10-16 15:43:03 -06:00
Thomas S Hatch
36f70e3614 Merge pull request #7893 from whiteinge/codeauthor-pdf-conflict 
Removed :codeauthor: field lists from logging handler docs
 2013-10-16 14:32:26 -07:00
David Boucha
7c106a7866 remove unused old commented out code 2013-10-16 15:31:24 -06:00
David Boucha
5a368ef8c2 more conversion to python_shell=False 2013-10-16 15:28:00 -06:00
Seth House
022a695988 Removed :codeauthor: field lists from logging handler docs 
Fixes #7692

There is a conflict between author field list fields in rST and the
regular PDF metadata. If there is a workaround for this, I'd love to
know it but I'm pulling this out for now so the PDF will build. Besides,
who is Pedro Alonso and why is he claiming ownership of our modules?
 2013-10-16 15:18:07 -06:00
Seth House
67c9bdfe4b rST note fix for win_repo.update_git_repos 2013-10-16 15:12:47 -06:00
Seth House
1f990f0bed Fixed code-block in docker list items to not be blockquotes 2013-10-16 15:12:47 -06:00
Thomas S Hatch
fd220a7fdd Merge pull request #7891 from s0undt3ch/develop 
Improve code readability.
 2013-10-16 13:57:20 -07:00
Pedro Algarvio
badf339b01 Improve code readability. 2013-10-16 21:51:51 +01:00
Thomas S Hatch
da8a60f775 revert fix for #7526 as it is breaking pydsl, this check should 
be added higher up[ the stack...
 2013-10-16 14:50:28 -06:00
Henrik Holmboe
aa1bfc8947 Use same unit as input 2013-10-16 21:16:48 +02:00
Henrik Holmboe
f5fa6afe83 Add another unit test for disk controller 2013-10-16 21:10:59 +02:00
Henrik Holmboe
e2c999936d Refactor disk controller part of _gen_xml() 2013-10-16 21:08:55 +02:00
Henrik Holmboe
4460ed4d69 Add unit test for disk controller 2013-10-16 21:06:26 +02:00
Henrik Holmboe
02212f99a8 Refactor boot device part of _gen_xml() 
The implementation that this commit replaces was carried over from my
first WIP implementation and did not fully work.

If I understand the original code correctly there was a bug in
supporting multiple boot devices because of a missing str.split().
 2013-10-16 20:53:46 +02:00
Henrik Holmboe
fb569991b5 Add unit test for boot device 2013-10-16 20:53:37 +02:00
David Boucha
edf150d60b don't use python_shell for external inputs 2013-10-16 12:36:50 -06:00
Thomas S Hatch
bbd159f8a0 Not sure why we are removing a file from the source halfway in a 
test, this should fix the failing test, @s0undt3ch, if this break
something I am not seeing please let me know
 2013-10-16 12:17:59 -06:00
David Boucha
cd3640b6a2 use python_shell=False on external inputs 2013-10-16 12:13:28 -06:00
Thomas S Hatch
3143cb6e48 import skipif 2013-10-16 12:13:16 -06:00
David Boucha
2b2d885f96 use python_shell=False when using external inputs 2013-10-16 11:40:42 -06:00
Thomas S Hatch
848bd5fc5e Merge pull request #7885 from loz-hurst/develop 
Added note about methods with trailing underscores to module docs.
 2013-10-16 10:12:16 -07:00
loz-hurst
91d7b2a346 Added note about methods with trailing underscores to module docs. 
Not fantastically impressed with what I've written and welcome for someone else to have a stab at it - trying to rectify that it's not clear from the docs ANYWHERE that, e.g., salt.states.alternatives.set_ must be specified as 'alternatives.set' or 'alternatives: - set' in the sls.  'alternatives.set_' or 'alternatives: - set_' will not work.

As a python coder it's obvious what's going on to avoid the name clash in the source but I wouldn't expect all salt users to be python programmers so it needs mentioning somewhere, imho.
 2013-10-16 18:10:02 +01:00
Thomas S Hatch
5e7f4ced0b Merge pull request #7884 from whiteinge/docker-mod-fixes 
Bunch of misc. fixes and updates to the new docker modules
 2013-10-16 10:09:59 -07:00
Seth House
8c455dabd2 Collection o' rST changes to the docker module docstrings 2013-10-16 10:58:08 -06:00
Seth House
b0754813df Added docker execution and state modules to docs 2013-10-16 10:58:04 -06:00
Thomas S Hatch
bd6b0f8523 Move gen_token into Auth class for more generic use 2013-10-16 10:53:53 -06:00
Seth House
f500143525 Updated a few remaining "lxcdocker" references to just "docker" 2013-10-16 10:49:42 -06:00
Seth House
fd7fd06ebc Removed docs for lxcdocker execution and state modules 2013-10-16 10:47:12 -06:00
Thomas S Hatch
3649d853f5 Merge pull request #7882 from s0undt3ch/develop 
Don't return `None` in `salt.modules.dockerio.__virtual__()`.
 2013-10-16 09:46:29 -07:00
Pedro Algarvio
4bc5c9ac4b Don't return None in salt.states.dockerio.__virtual__(). 2013-10-16 17:39:05 +01:00
Seth House
04edf31153 Add explicit return False to dockerio __virtual__ function 2013-10-16 10:34:10 -06:00
Pedro Algarvio
40d70fb13f os.getcwd() might thrown an OSError if it was deleted or moved. 
Let's not fail because of that.
 2013-10-16 17:32:22 +01:00
Pedro Algarvio
7de1cda6da The test needs to be executed as root to pass. 2013-10-16 17:27:05 +01:00