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
15,567 Commits 24 Branches 182 Tags 341 MiB
b14e4f9919
Commit Graph

15567 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Thomas S Hatch
5fa897ed9c Merge pull request #6034 from extesy/patch-1 
Enhance virtualenv module to install distribute/pip
 2013-07-12 10:21:09 -07:00
Umberto Nicoletti
2256fc9a44 improve the sentry returner so that successful executions are also sent to sentry. Also provide more configuration options for tagging messages in the sentry UI 2013-07-12 09:40:39 +02:00
Joseph Hall
1149a1b51f Merge pull request #6121 from kylegato/patch-1 
Added logic to failback to python os.getloadavg if procfs does not exist
 2013-07-11 20:44:21 -07:00
Joseph Hall
1bf40a8f74 Merge pull request #6119 from terminalmage/quickfix 
Change behavior of apt._clean_pkglist
 2013-07-11 20:37:11 -07:00
David Boucha
c9d682712d Merge pull request #6120 from terminalmage/issue6116 
import _binary_replace for win_file.py
 2013-07-11 19:19:55 -07:00
David Boucha
94da208d83 Merge pull request #6122 from herlo/develop 
Fedora/EPEL RPM spec file for feature release 0.16.0
 2013-07-11 16:50:14 -07:00
Clint Savage
a1729fb373 updating spec file to feature release 0.16.0 2013-07-11 17:13:00 -06:00
Kyle Gato
10adff8c7b Added logic to failback to python os.getloadavg if procfs does not exist, such as in FreeBSD for load averages 2013-07-11 16:08:45 -07:00
Erik Johnson
1dccb1e8e8 import _binary_replace for win_file.py 
Windows file management re-uses a lot of functions from
salt.modules.file, and a new function added in b93c724, which is needed
in check_file_meta(), was not added to the functions that are imported
into win_file.py. Fixes #6116.
 2013-07-11 17:54:17 -05:00
Erik Johnson
daf5aa7284 Change behavior of apt._clean_pkglist 
The current behavior of this function will remove all instances of '1'
from the version list for a package. If the list only contains multiple
instances of '1', this will clear the list though, and that's not what
is wanted. The intention I had for this function when I wrote it was to
strip all virtual package markers if that package is both a real package
and virtual package, but also to take instances where more than one
target of a virtual package is installed, and make it so that only one
instance of '1' is in the version list for that package. This commit
adjusts the behavior to work that way.
 2013-07-11 17:31:26 -05:00
Joseph Hall
6545fd96b2 Merge pull request #6115 from hulu/extra-kwargs-err-check 
Error on completely invalid kwd args; follow-up to #6093
 2013-07-11 13:49:20 -07:00
Chris Rebert
caa0fdd6be Error on completely invalid kwd args; follow-up to #6093 2013-07-11 13:44:09 -07:00
Joseph Hall
4f16422657 Merge pull request #6112 from mgwilliams/ddns 
ddns: add add_host and delete_host functions
 2013-07-11 13:37:09 -07:00
Matthew Williams
f527c02b08 ddns: add add_host and delete_host functions 2013-07-11 20:34:08 +00:00