valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
12,102 Commits 24 Branches 182 Tags 341 MiB
a10e5ed01e
Commit Graph

12102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
68b5aacf58 Update minion to return extra key data to master 2013-03-26 14:03:53 -06:00
Thomas S Hatch
2156fbea29 Fix bad ref, forgot the __salt__ :P 2013-03-26 13:21:19 -06:00
Thomas S Hatch
f93aaab606 Add first monitoring state - experimental 2013-03-26 12:59:45 -06:00
Thomas S Hatch
9c507a9ef7 Merge pull request #4285 from giantlock/develop 
Fix lost import
 2013-03-26 10:36:17 -07:00
Denis Generalov
dfed9be41f * add lost import 
* pep8 fix
 2013-03-26 21:32:04 +04:00
Thomas S Hatch
3c2eb31852 Merge pull request #4284 from dlindquist/xcp 
Add XenServer to grains and set proper virtual pkg
 2013-03-26 10:27:05 -07:00
David Lindquist
23953994ee Add XenServer to _OS_FAMILY and special case usage of yumpkg5 based on XenServer major version 2013-03-26 10:11:04 -07:00
Thomas S Hatch
c0b05f0c65 Fix #4279 2013-03-26 11:08:03 -06:00
Thomas S Hatch
f2c7a4ccce Merge pull request #4277 from dlindquist/xcp 
XCP <= 1.6 should use yumpkg5
 2013-03-25 23:40:24 -07:00
David Lindquist
b8297f4ac7 Use os_grain instead os_family. Also, use yumpkg for XCP >= 2.0 per http://wiki.xen.org/wiki/XCP_Roadmap 2013-03-25 23:35:56 -07:00
Thomas S Hatch
3422648eb8 Merge pull request #3976 from dcolish/salt-call-use-cli-arg-modules 
Enable the usage of existing 'salt-call -m' option.
 2013-03-25 23:33:04 -07:00
Thomas S Hatch
80043ce768 Add XCP to the os_family grainmap per #4277 2013-03-26 00:06:55 -06:00
Thomas S Hatch
7a34acedc8 Clean up log print statement that was left behind 2013-03-25 23:32:14 -06:00
Thomas S Hatch
0ccdccfce2 That was embarrasing, I left the self in... 
Fix #4275
 2013-03-25 23:29:04 -06:00
Thomas S Hatch
bc7fd90f6a Merge pull request #4271 from whiteinge/salt-wheel-traceback 
Catch possible traceback when passing incorrect lowstate to wheel system
 2013-03-25 22:21:34 -07:00
Thomas S Hatch
db6d887e93 Add a log message to when a bad renderer is passed in 
Fix #4269
 2013-03-25 23:21:03 -06:00
Jeff Schroeder
86e7900c29 Adding tomcat state documentation 
Fixes #4256
 2013-03-26 00:06:12 -05:00
Jeff Schroeder
26a8c85ae8 Fix a few RST problems 2013-03-25 23:59:56 -05:00
Thomas S Hatch
e0ec54b389 Add verification for names to be a list, fix #4265 2013-03-25 22:48:52 -06:00
Jeff Schroeder
e3f1179030 Merge pull request #4270 from dlindquist/develop 
Fix several docstrings
 2013-03-25 21:36:08 -07:00
Thomas S Hatch
7a3adf5e12 protect from making / absent 2013-03-25 22:28:01 -06:00
Thomas S Hatch
037edd5449 Use get to avoid an error when the function loses the retcode 
Fix #4267
 2013-03-25 22:22:55 -06:00
Thomas S Hatch
0e15b144a3 Merge pull request #4261 from whiteinge/salt-readme 
Updated old README with community content
 2013-03-25 20:33:30 -07:00
David Lindquist
796a97746f XCP <= 1.6 should use yumpkg5 2013-03-25 19:05:30 -07:00
Seth House
f654cda390 Catch possible traceback when passing incorrect lowstate to wheel system 2013-03-25 18:05:58 -06:00
David Lindquist
963ae07ddf Fix several docstrings 2013-03-25 16:48:40 -07:00
Jeff Schroeder
3de4e7d5dd Removing a stray print in state.py 
This was really annoying when running salt-call in 0.14
 2013-03-25 16:30:28 -05:00
Thomas S Hatch
2f1c670c67 Merge pull request #4259 from jacksontj/develop 
Enforce a timeout (#3431) even if you get an event every time you look
 2013-03-25 13:39:13 -07:00
Thomas S Hatch
f0246e289b Merge pull request #4262 from mgwilliams/docs 
docs for new pillar and tops modules
 2013-03-25 13:38:12 -07:00
Thomas S Hatch
a045d952be Merge pull request #4252 from slai/develop 
PID file now written prior to Minion init
 2013-03-25 13:12:36 -07:00
Seth House
f1ade3db15 Updated old README with community content 
As xt pointed out, this was a bit dated. I pulled replacement content
from the first paragraph in the docs and the community page on the
website.
 2013-03-25 12:07:45 -06:00
Matthew Williams
8c0a32f335 fix docstrings for cobbler pillar and tops modules 2013-03-25 09:57:26 -07:00
Thomas Jackson
10eba2735b Enforce a timeout (#3431) even if you get an event every time you look 
If you have a fairly busy event system (lots of minions) you will always get an event ever time that you look. This causes the tag check to catch it and do a continue, so you (effectively) get stuck reading all the messages on the event bus indefinetly-- which causes the timeout to never be enforced
 2013-03-25 09:46:19 -07:00
Matthew Williams
89a474d5aa fix inconsistency in modules/service.py docs (for real) 2013-03-25 09:43:26 -07:00
Matthew Williams
ed7b155ddf add docs for new pillar and tops modules 
fix inconsistency in modules/service.py docs
 2013-03-25 09:42:52 -07:00
Thomas S Hatch
42932f7390 Merge pull request #4250 from spacedentist/develop 
Mirror salt.utils.pydsl.StateDeclaration.__getattr__ as __getitem__
 2013-03-25 09:17:10 -07:00
Thomas S Hatch
8e3c69c9a3 Merge pull request #4246 from s0undt3ch/hotfix/start-logging-soon 
Start logging to the console as soon as possible.
 2013-03-25 09:15:49 -07:00
Joseph Hall
23890ae6e4 Merge pull request #4257 from benhosmer/develop 
Fix typo in group_info docstring
 2013-03-25 07:32:38 -07:00
Ben Hosmer
94464d6e72 Fix typo in group_info docstring 2013-03-25 11:31:34 -03:00
David Boucha
8db9c100b1 Merge pull request #4253 from joehealy/issue4248 
Fixed typo
 2013-03-25 07:09:41 -07:00
Joseph Hall
cdcecdf23a Update formatting in the docstring 2013-03-25 06:20:04 -06:00
Joseph Hall
bcd49fab54 Merge pull request #4249 from Katafalkas/raid.create_to_mdadm_module 
Adding raid.create function to mdadm module.
 2013-03-25 05:11:34 -07:00
Joe Healy
be7561430c Fixed typo 
some issues remain - may only be with windows installer build though
 2013-03-25 23:08:43 +11:00
Sam
8d2950cf4d The pidfile is now written prior to Minion init so the process can be managed during the init phase. 2013-03-25 22:31:27 +11:00
Audrius Kucinskas
6500c725be forgot to uncomment the rest of the code. 2013-03-25 13:27:37 +02:00
Sven Over
14dd9a0e4b Mirror salt.utils.pydsl.StateDeclaration.__getattr__ as __getitem__ 
This is helpful e.g. in top.sls files where non-keyword like attributes
of the state('base') object often get accessed. This little patch allows
to write things like:

  state('base')['*'].foo
 2013-03-25 12:27:21 +01:00
Audrius Kucinskas
127d357a8a Adding raid.create function to mdadm module. 2013-03-25 13:23:10 +02:00
Pedro Algarvio
dc5466b0e3 Merge pull request #4247 from giantlock/develop 
Fix lost import.
 2013-03-25 04:18:29 -07:00
Denis Generalov
e221d344cb fix lost import 2013-03-25 14:42:08 +04:00
Pedro Algarvio
2e39f3197e Start logging to the console as soon as possible. 
Besides having a null logging handler which fixed several annoyances, we now added a temporary stream logging handler.
We did not detect the need for this temporary logging handler in salt, but projects making use of salt, for example salt-cloud, and because of how our parsers system works, would not get some useful logging output because it was not yet setup when needed.

So, logging now works(gets setup) in the following steps.

* Null logging handler right at import time. (No more, no handler for blah)
* Temporary logging handler. If console logging is supposed to happen, a temp logging handler will be setup right after arguments/options from the console are parsed(respects `-l <log-level>`), but it still does not know about any settings from the configuration files.
* Proper console logging is setup. Respects the console parsed options and also the configuration files. (Null and temp logging handlers are removed/deleted)
* Proper file logging taking into account the options set in the configuration files.
 2013-03-25 09:29:14 +00:00