Thomas S Hatch
8be963fb09
Merge pull request #359 from SEJeff/module-cleanups
...
RFC: Module cleanups
2011-12-14 22:38:25 -08:00
Jeff Schroeder
d24f85687f
Fix a few syntax errors introduced to the virt module
2011-12-14 22:31:57 -08:00
Jeff Schroeder
d158456a64
Merge branch 'develop' of https://github.com/saltstack/salt into module-cleanups
2011-12-14 22:23:29 -08:00
Jeff Schroeder
fb2a8bcbcf
Major change from 'some str'.count(search) to search in 'some str'
...
This patch is a function noop, but makes the code easier to read
2011-12-14 22:22:12 -08:00
Jeff Schroeder
4b5aad02dd
Pretty-print an error if an invalid signal is sent to solr.signal
2011-12-14 22:05:27 -08:00
Thomas S Hatch
17512f2711
add a get_url function
2011-12-14 22:59:49 -07:00
Thomas S Hatch
d89d162b58
Add ability to change the topfile to execute
2011-12-14 22:54:33 -07:00
Thomas S Hatch
cc3ea46058
fix issue is master is old and does not have failhard
2011-12-14 22:41:59 -07:00
Thomas S Hatch
9eb2698abb
Support to run specific modules in a specific environment
2011-12-14 22:40:29 -07:00
Jeff Schroeder
f90fc0654d
Major update to the apache module
...
- Add apache.signal text outputter
- Add the following signals: status, fullstatus, configtest
- Lots of style cleanups to fit better with the rest of salt
- Output information about what happened when signals are ran
2011-12-14 21:38:41 -08:00
Jeff Schroeder
1970016505
Change solr and ebuild modules from dict.has_key() to key in dict
...
As part of this branch, I'm trying to read through most all of the
modules and clean things up. This is small, and might not normally
warrant a commit, but I'm trying to keep things easy to bisect.
2011-12-14 20:53:27 -08:00
Jeff Schroeder
5e6f23fbef
Add disk.inodeusage and fix disk.usage logic
...
Previously, disk.usage was returning a dictionary where the key was in
the "Filesystem" column. It seemed proper to return every filesystem,
even the virtual ones so the dict key was changed to the mountpoint.
$ df -P
Filesystem 1024-blocks Used Available Capacity Mounted on
/dev/sda8 177822980 12504764 156285272 8% /
none 6154104 312 6153792 1% /dev
none 6161372 3736 6157636 1% /dev/shm
none 6161372 336 6161036 1% /var/run
none 6161372 0 6161372 0% /var/lock
/dev/sda1 101086 85423 15663 85% /boot
/dev/sda5 240308484 219822840 20485644 92% /home
/dev/sda7 54791132 1104204 50903672 3% /var
This can be changed to skip anything that has a Filesystem of none
down the road, but I don't have any non-Linux hosts to test on.
2011-12-14 20:47:13 -08:00
Jeff Schroeder
98148b33e4
Add cron.ls and cron.rm as aliases
...
For cron.list_jobs and cron.rm_tab. This just keeps things a bit
consistent and more obvious to any 'nix geek who happenst to look
2011-12-14 20:12:03 -08:00
Jeff Schroeder
e3b9c8e103
Add a few FIXMEs to the network module
...
- Add outputters for dig and netstat
- Remove a pointless check from network.netstat()
- The network module doesn't work in Ubuntu 10.10
- The traceroute module doesn't work in Ubuntu 10.10
2011-12-14 20:07:57 -08:00
Jeff Schroeder
f001b4d8a2
Remove subprocess from the network module
2011-12-14 20:07:57 -08:00
Jeff Schroeder
fd74f8b0b6
Remove grains.list in favor of grains.ls
...
It overrides a python builtin
2011-12-14 10:00:29 -08:00
Jeff Schroeder
241d825e13
Clean up the network module a bit
2011-12-13 23:25:36 -08:00
Jeff Schroeder
751119f0c9
Use cmd.run in disk and status modules instead of subprocess
2011-12-13 23:21:58 -08:00
Jeff Schroeder
be4d74189b
Light cleanup of the kmod module
2011-12-13 23:06:00 -08:00
Jeff Schroeder
509c1aa789
A few cleanups for the grains module
...
- grains.item and grains.list are now shorter
- grains.item can be called without an argument and won't barf
2011-12-13 23:05:57 -08:00
Jeff Schroeder
61773bdaf9
Fix a bug in ssh.host_keys
2011-12-13 23:05:54 -08:00
Thomas S Hatch
a07fd0577c
Merge branch 'develop' of github.com:saltstack/salt into develop
2011-12-13 22:13:02 -07:00
Thomas S Hatch
251c238e7d
Merge branch 'msgpack' into develop
2011-12-13 22:12:34 -07:00
Thomas S Hatch
667f4163f9
Add saftey to prevent master workers from dying with old minions
2011-12-13 22:05:16 -07:00
Thomas S Hatch
702bc3f6b0
update more package refs
2011-12-13 21:41:49 -07:00
Thomas S Hatch
44b53fa130
Fix references to old package unpackage
2011-12-13 21:36:25 -07:00
Thomas S Hatch
16bb1d8f3a
Add some self
2011-12-13 21:32:52 -07:00
Thomas S Hatch
8b025bb661
forgot to quote
2011-12-13 21:26:20 -07:00
Thomas S Hatch
a411447739
fix crypticale opts ordering
2011-12-13 21:24:21 -07:00
Thomas S Hatch
b79e0017c4
Transform serialization systems to use the serial class
2011-12-13 21:15:56 -07:00
Thomas S Hatch
fd4d47ed6b
change serialization to use a class
2011-12-13 20:20:34 -07:00
Chris Scheller
b725c2d884
merge of upstream/develop to bring in compound target support
2011-12-13 14:24:59 -05:00
Thomas S Hatch
2ac459fb51
Merge pull request #354 from SEJeff/misc-cleanups
...
Misc cleanups
2011-12-13 08:37:19 -08:00
Jeff Schroeder
e7db6d4a3e
Allow module specific __init__()
...
Closes #138
2011-12-12 22:10:04 -08:00
Jeff Schroeder
2829ae5e41
Fix a typo in the master log for accepting salt keys
2011-12-12 21:57:52 -08:00
Thomas S Hatch
0e8cfcf5c3
Merge pull request #350 from whiteinge/salt-sed
...
Add sed, comment, uncomment, contains, append functions & states
2011-12-12 15:34:59 -08:00
Thomas S Hatch
d226568630
Merge pull request #351 from whiteinge/doc-freenode
...
Updated IRC references from OFTC to Freenode
2011-12-12 15:34:20 -08:00
Seth House
badb3dff12
Updated IRC references from OFTC to Freenode
2011-12-12 13:53:36 -07:00
Seth House
d369d7f4ce
Add sed, comment, uncomment, contains, append functions & states
2011-12-12 10:49:36 -07:00
Thomas S Hatch
16ae723fcd
Merge pull request #348 from whiteinge/doc-el5install
...
Fixed el5 and Lucid instructions
2011-12-12 09:18:32 -08:00
Seth House
a9a0f58698
Simplified the Lucid instructions
...
I don't yet know how to get the PPA also building for Maverick, so may
as well simplify the instructions for now.
2011-12-12 01:54:56 -07:00
Seth House
b08b0f98f5
Added el5/el6 install instructions; unified all the rpm instructions
2011-12-12 01:51:36 -07:00
Thomas S Hatch
677d65d0aa
Add dump and load to salt.payload
2011-12-11 23:28:06 -07:00
Thomas S Hatch
e7c22158ad
update to use the payload module
2011-12-11 23:07:08 -07:00
Thomas S Hatch
f6bf4f4de9
Add dumps and loads functions to payload.py
2011-12-11 22:38:39 -07:00
Thomas S Hatch
178f06e694
Merge pull request #346 from SEJeff/misc-cleanups
...
Add utils.which() and clean up some _virtual() logic
2011-12-10 23:27:59 -08:00
Jeff Schroeder
8f55f3591b
Allow calling which() without an argument
2011-12-10 23:28:58 -08:00
Jeff Schroeder
16eeaa63df
Merge branch 'develop' of https://github.com/saltstack/salt into misc-cleanups
...
Conflicts:
salt/utils/__init__.py
Fix the merge conflicts by adding utils.which() before utils.list_files()
2011-12-10 23:23:25 -08:00
Jeff Schroeder
3e3fc17a70
Don't call salt.utils.which() from salt.loader.Loader.get_grains()
...
Otherwise it will traceback
2011-12-10 23:15:47 -08:00
Jeff Schroeder
98f977b365
Fix an improper import
2011-12-10 23:01:38 -08:00