valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
15,281 Commits 24 Branches 182 Tags 341 MiB
b90f7c00d5
Commit Graph

15281 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
b90f7c00d5 Merge pull request #6150 from terminalmage/docs 
Clarify returner docs
 2013-07-13 21:07:02 -07:00
Erik Johnson
cc8812fa3e Clarify returner docs 2013-07-13 23:06:35 -05:00
Erik Johnson
9be2313717 Merge pull request #6149 from terminalmage/docs 
Fix typo in top.sls docs
 2013-07-13 20:31:53 -07:00
Erik Johnson
7693cd3f6e Fix typo in top.sls docs 
The extra ':' here negates the code-block section. Removed it.
 2013-07-13 22:30:18 -05:00
Pedro Algarvio
91e80bc994 Only send coverage info on Travis-CI success. 2013-07-13 22:49:38 +01:00
Thomas S Hatch
f74fcfd5ea Add state_order to master opts 2013-07-13 14:53:10 -06:00
Thomas S Hatch
2cbe8f27e8 Add state_auto_order to mopts 2013-07-13 14:36:59 -06:00
Thomas S Hatch
757767036d simplify the iorder assignment and make includes first 2013-07-13 14:30:27 -06:00
Pedro Algarvio
64c9463a8b Merge pull request #6143 from s0undt3ch/issues/6129-unexpected-__env__-keyword 
Fix Issue #6129 unexpected `__env__`  keyword
 2013-07-13 11:53:19 -07:00
Pedro Algarvio
62287b8917 Merge pull request #6142 from s0undt3ch/hotfix/salt-modules-rvm-pylint 
Update mocked rvm unit test since we now call `cmd.run_all` instead of `cmd.retcode`
 2013-07-13 11:52:07 -07:00
Pedro Algarvio
96852d96ca jinja2.ext.Extension is apparently an old-style class. 2013-07-13 18:51:51 +01:00
Pedro Algarvio
5bee1ca7f3 Re-implement 06ac67c84a the right way since the state __env__ was being confused by the shell environment. Fixes #6129. 2013-07-13 18:45:30 +01:00
Pedro Algarvio
fc63bb4469 Revert "Fix pip module for python 3" 
This reverts commit 06ac67c84a.
 2013-07-13 18:14:32 +01:00
Pedro Algarvio
269175145f Update mocked rvm unit test since we now call cmd.run_all instead of cmd.retcode. 2013-07-13 17:46:46 +01:00
Thomas S Hatch
7c61db7260 Merge pull request #6141 from s0undt3ch/hotfix/pylint-salt.utils.jinja 
Fix pylint issues regarding `salt.utils.jinja`
 2013-07-13 09:28:23 -07:00
Thomas S Hatch
1a05cb7c2c Merge pull request #6140 from s0undt3ch/hotfix/pylint-bad-first-argument 
Hotfix pylint bad first argument
 2013-07-13 09:27:29 -07:00
Thomas S Hatch
30dee739eb Merge pull request #6139 from s0undt3ch/hotfix/pylint-unexpected-tty-argument 
For @thatch45 to review. Remove the `tty` logic left from 0d6ff2e.
 2013-07-13 09:26:38 -07:00
Thomas S Hatch
c2f4200bb0 Merge pull request #6138 from s0undt3ch/hotfix/salt-modules-rvm-pylint 
Fix the errors shown by pylint in the rvm module
 2013-07-13 09:25:45 -07:00
Pedro Algarvio
3db3618e20 Implement SerializerExtension.parse() to comply with pylint. 2013-07-13 17:19:37 +01:00
Pedro Algarvio
e40bb42210 Call self.environment instead of environment. 2013-07-13 17:19:00 +01:00
Pedro Algarvio
7d90720688 Make sure salt.utils.jinja.SerializerExtension calls it's parent class __init__ method. 2013-07-13 17:15:25 +01:00
Pedro Algarvio
f4b015b88e Double to single quotes and fix non python 2.6 compatible format() call using {} instead of {0}. 2013-07-13 17:14:35 +01:00
Pedro Algarvio
1cfbbd3a69 Work around pylint bug of wrongly reporting too many arguments. 
More info on http://hustoknow.blogspot.pt/2013/06/pylint.html
 2013-07-13 17:05:56 +01:00
Pedro Algarvio
8512cff5a8 Fix bad first argument of SSHCopyID. 
* Keep a reference to the passed `opts` since they are used further down the class.
 2013-07-13 16:54:32 +01:00
Pedro Algarvio
043b47f251 Remove the tty logic left from 0d6ff2e. 2013-07-13 16:48:35 +01:00
Joseph Hall
cba6ba0dff Merge pull request #6137 from jpea/develop 
OpenVZ Hardware Node process list fix
 2013-07-13 08:38:25 -07:00
Pedro Algarvio
549633058b Fix pylint errors, the _rvm() and _do_rvm() were being given runas twice because of a badly constructed command string. 2013-07-13 16:34:36 +01:00
Pedro Algarvio
95c7643849 Some formatting, logic, and speedup improvements(only create the same regexes once). 2013-07-13 16:34:36 +01:00
JP Espinosa
e208ebf994 OpenVZ Hardware Node process list fix 
Fixed a bug with OpenVZ Hardware Node (virtual:openvzhn) using a
missing `vzps` command, not an official tool anymore

The Fix:
Obtain the processes running on hardware node as OpenVZ recommends and
format to looks like regular `ps -efH` for salt
 2013-07-13 08:13:07 -05:00
Pedro Algarvio
e9b1fce088 Merge pull request #6135 from hvnsweeting/develop 
indent code in doc
 2013-07-13 05:08:30 -07:00
hvnsweeting
dc98fa6f88 indent code 2013-07-13 12:32:49 +07:00
Thomas S Hatch
bfcd814ca7 Deal with multi comp id decs wrt auto_order 2013-07-12 22:35:53 -06:00
Thomas S Hatch
79fed61dc4 Always use an ordered dict for yaml renderer 2013-07-12 22:23:37 -06:00
Thomas S Hatch
5d806a9f9e fix bad var in state updates 2013-07-12 22:20:15 -06:00
Thomas S Hatch
c4b079e826 Add backing for running states imperitive 2013-07-12 22:08:02 -06:00
Thomas S Hatch
61a1f00882 Add docstrings to some state methods 2013-07-12 22:08:02 -06:00
Joseph Hall
5a1a283fb6 Merge pull request #6134 from terminalmage/issue5374 
Allow alternate enc names to be used for ssh_auth states
 2013-07-12 20:43:31 -07:00
Erik Johnson
045ed23edf Allow alternate enc names to be used for ssh_auth states 
If 'rsa' or 'dss', etc. are used as the 'enc' value in ssh_auth.present
states (rather than 'ssh-rsa' or 'ssh-dss'), the call to
salt.modules.ssh.check_key() will fail, which causes ssh_auth.present
states to mistakenly report the key as needing to be changed. This
commit adds a call to salt.modules.ssh._refine_enc(), which normalizes
the 'enc' param so that the call to ssh.check_key() does not fail.

Fixes #5374.
 2013-07-12 22:01:06 -05:00
Thomas S Hatch
c330e47ce3 Merge pull request #6131 from mgwilliams/bugs 
pillar: fix minor bug
 2013-07-12 16:57:18 -07:00
Matthew Williams
1f07057360 pillar: fix minor bug 2013-07-12 23:53:59 +00:00
Thomas S Hatch
379f7e99c5 Merge pull request #6130 from UtahDave/develop 
Add note about silent_flags on Windows installers.
 2013-07-12 16:44:47 -07:00
David Boucha
e51f7dc94b Add note about silent_flags on Windows installers. 2013-07-12 17:24:12 -06:00
Thomas S Hatch
e0397e4d72 single quotes 2013-07-12 13:55:46 -06:00
Joseph Hall
d73e7f3755 Merge pull request #6125 from cvrebert/patch-2 
returners/sentry_return.py: fix indents & spacing
 2013-07-12 12:11:47 -07:00
Chris Rebert
fbd9edac53 returners/sentry_return.py: fix indents & spacing 
************* Module salt.returners.sentry_return
W0311: 66,0: Bad indentation. Found 11 spaces, expected 12
W0311: 67,0: Bad indentation. Found 15 spaces, expected 16
W0311: 70,0: Bad indentation. Found 11 spaces, expected 12
C0322: 70,11:returner.connect_sentry: Operator not preceded by a space
           data['level']='info'
 2013-07-12 11:57:25 -07:00
Thomas S Hatch
a764e33a24 Merge pull request #5991 from hulu/travis-pylint 
Integrate pylint into Travis build process
 2013-07-12 11:05:15 -07:00
Thomas S Hatch
7e90cb0f1e Merge pull request #6123 from unicolet/pullrequests/returners/sentry 
improve the sentry returner so that successful executions are also sent ...
 2013-07-12 10:50:38 -07:00
Thomas S Hatch
6a86d25701 Merge pull request #6072 from cvrebert/patch-1 
SaltLoggingClass: Pass __init__ args thru to superclass' __new__
 2013-07-12 10:31:06 -07:00
Thomas S Hatch
46700b2e6c Merge pull request #6039 from johnnoone/config-extension 
Serialize dataset into file states and jinja templates
 2013-07-12 10:28:47 -07:00
Thomas S Hatch
3a90844fe5 Merge branch 'patch-2' of git://github.com/extesy/salt into extesy-patch-2 
Conflicts:
	salt/modules/pip.py
 2013-07-12 11:19:38 -06:00