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,007 Commits 24 Branches 182 Tags 341 MiB
bbd159f8a0
Commit Graph

19007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Thomas S Hatch
3143cb6e48 import skipif 2013-10-16 12:13:16 -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
Pedro Algarvio
7cf0aaa5e8 Don't return None in salt.modules.dockerio.__virtual__(). 2013-10-16 17:21:22 +01:00
Thomas S Hatch
5c623c1e93 Fix mine lint errors 2013-10-16 09:54:11 -06:00
Thomas S Hatch
7b850ff3d0 Add token checks for a number of additional areas 
This issue has potentially been mis-represented, all gateways that
control sensitive data about minions have always been cleanly controlled
this addition just prevents a minion from miss-posting data on the
master.
 2013-10-16 09:36:50 -06:00
Thomas S Hatch
151759b2a1 Add token checks to mine uploads 2013-10-16 09:36:50 -06:00
Pedro Algarvio
9f29d0012e Fix typo from 6bc5ea34. 2013-10-16 16:37:36 +01:00
Aditya Kulkarni
365f753846 Merge pull request #7881 from pass-by-value/7367 
Add success key to dict that is passed to a returner via salt-call and s...
 2013-10-16 08:33:31 -07:00
Pedro Algarvio
2242a60011 Merge pull request #7880 from whiteinge/python-serializer-filter 
Also add a Python serializer filter
 2013-10-16 08:30:44 -07:00
Seth House
bd897c0bdb Add unit test for the "python" jinja filter 
Missing from c91fe1c (pull req #7866).
 2013-10-16 09:24:40 -06:00
Seth House
54cc36566e Added a pprint.pformat Jinja filter to match the file.serialize state 2013-10-16 09:23:14 -06:00
Aditya Kulkarni
dda0dfb930 Add success key to dict that is passed to a returner via salt-call and scheduler 2013-10-16 15:21:24 +00:00
Thomas S Hatch
402ff300fa Merge pull request #7877 from s0undt3ch/hotfix/lint 
Some Lint fixes
 2013-10-16 08:17:36 -07:00
Pedro Algarvio
59245b2e4f Fix PEP-8 E712. is True 2013-10-16 16:16:32 +01:00
Pedro Algarvio
9a844cbd23 Fix mixed tabs with spaces. 2013-10-16 16:10:28 +01:00
Thomas S Hatch
267d04a32d Merge pull request #7875 from s0undt3ch/develop 
Log to user home directory if user is in ACL
 2013-10-16 07:47:19 -07:00
Thomas S Hatch
955bc3d11a Merge pull request #7874 from skrobul/rvm_no_sudo 
Stop calling sudo for RVM installs when running as non-root user.
 2013-10-16 07:46:49 -07:00
Thomas S Hatch
361e094bd9 Merge pull request #7866 from whiteinge/serialize-to-python 
Added a Python formatter to the file.serialize state
 2013-10-16 07:45:58 -07:00
Thomas S Hatch
65e7575c81 Merge pull request #7865 from UtahDave/shell_false 
Add python_shell flag to cmdmod functions.
 2013-10-16 07:43:38 -07:00
Pedro Algarvio
3788060013 Log to user home directory if user is in ACL and is unable to write to logs directory. Fixes #7706. 2013-10-16 12:23:03 +01:00
Marek Skrobacki
347550ec12 change 'rvm install' calls not to try sudo if 'runas' is set to non-root user 2013-10-16 11:54:50 +01:00
Aditya Kulkarni
d2f16e6c85 Merge pull request #7867 from cachedout/develop 
Fix typo.
 2013-10-15 19:41:55 -07:00
Mike Place
8eb4d80316 Fix typo. 2013-10-15 19:30:35 -06:00
Seth House
c91fe1c86d Added a Python formatter to the serialize state 2013-10-15 18:29:30 -06:00
Thomas S Hatch
6eb37e4180 lint fixes for dockerio execution module 2013-10-15 18:13:58 -06:00
Thomas S Hatch
891e648d22 Clean up basic lint stuff and change lxcdocker refs to docker 2013-10-15 18:09:22 -06:00
Thomas S Hatch
4807c90ecb Add beta api notice to docker state 2013-10-15 17:58:54 -06:00
Thomas S Hatch
053e0f393e Cleaned up the exposed valid, invalis and ret_status functions 
to not be exposed, and a few docstring additions and some single
quote fixes
 2013-10-15 17:50:02 -06:00
Thomas S Hatch
36ec2d0812 Add unstable api warning and spelling fixes 2013-10-15 17:45:13 -06:00
Thomas S Hatch
e612d55e52 Clean up docstrings for new dockerio module 2013-10-15 17:39:14 -06:00
David Boucha
2125c7781b Add python_shell flag to cmdmod functions. 
The cmdmod functions use shell=True by default. To allow for safer calls
add python_shell=False to the call and pass in the arguments as a
sequence

sudo salt 'dasalt' cmd.run 'ls -lh /'

sudo salt 'dasalt' cmd.run '["ls", "-lh", "/"]' python_shell=False
 2013-10-15 17:16:24 -06:00
Thomas S Hatch
7d164e687e Merge pull request #7864 from makinacorpus/docker 
Docker support
 2013-10-15 16:13:39 -07:00
Thomas S Hatch
aa584dc255 Add ret value to test return data 2013-10-15 17:05:04 -06:00
Thomas S Hatch
ca0e967c13 Assign the ret value 2013-10-15 17:03:12 -06:00
Thomas S Hatch
6bc5ea34e9 Ensure that the ports are integers 2013-10-15 16:59:44 -06:00
Thomas S Hatch
8612f7c007 Add ref to ret in test_7754 2013-10-15 16:34:17 -06:00
Thomas S Hatch
42f93d53ae Merge pull request #7861 from rca/salt_local_file_root_option 
Added --file-root option for local salt run
 2013-10-15 15:34:11 -07:00