Commit Graph

1916 Commits

Author SHA1 Message Date
Thomas S Hatch
dfe041d146 Add state wrting doc - still needs some love 2011-12-04 23:29:03 -07:00
Thomas S Hatch
889f407f2f Merge pull request #317 from herlo/master
Updated the salt spec for rpms
2011-12-04 20:41:11 -08:00
Clint Savage
1ec4aa8c3a adding updated spec for rpm 2011-12-04 21:39:28 -07:00
Thomas S Hatch
6edb7f4c38 dd some documentation for compond targets 2011-12-04 16:09:12 -07:00
Thomas S Hatch
46a3e538f3 update salt manpage for the new compound matcher 2011-12-04 15:34:01 -07:00
Thomas S Hatch
7fac87dafc Merge pull request #315 from epoelke/develop
minor yumpkg updates.  mysql: Now with slave_lag!
2011-12-04 12:51:39 -08:00
Eric Poelke
17091e3d05 Updated yumpkg and yumpkg5 to do the right thing for Fedora's older than 11, added slave_lag function to mysql module. 2011-12-04 11:05:40 -08:00
Eric Poelke
d96f391bd7 Merge branch 'develop' of git://github.com/saltstack/salt into develop 2011-12-04 11:05:05 -08:00
Thomas S Hatch
d84cd330bd Merge branch 'develop' of github.com:saltstack/salt into develop 2011-12-04 10:02:23 -07:00
Thomas S Hatch
e9fccae965 Merge pull request #313 from cedwards/develop
fixed PKGBUILD for 0.9.4
2011-12-04 08:26:44 -08:00
Eric Poelke
dbd4a450a7 Merge branch 'develop' of git://github.com/saltstack/salt into develop 2011-12-03 19:58:00 -08:00
Eric Poelke
e3f7ee7849 Minor fix to yumpkg and yumpkg5. yumpkg now assumes all Fedora releases have yum,rpm modules for python26. Fedora has had python26 since release 11 so this should be safe. Removed Fedora from yumpkg5 as a possible choice. 2011-12-03 14:36:11 -08:00
Thomas S Hatch
d02a5c3014 finish minion side for compound target evaluation 2011-12-03 14:18:20 -07:00
Thomas S Hatch
ed6fc5f8be Add frontend for compount target detection 2011-12-03 13:07:26 -07:00
Christer Edwards
ea3cce87dd fixed path to rc scripts in package() 2011-12-03 11:38:15 -07:00
Christer Edwards
0f6fd8d2f9 fixed paths in package() & include all md5sums 2011-12-03 11:17:45 -07:00
Thomas S Hatch
524891fadf set the local refresh tag if a state lays down fresh modules 2011-12-02 22:17:28 -07:00
Thomas S Hatch
2449576a26 Add a local signal check for module refreshing 2011-12-02 22:08:58 -07:00
Thomas S Hatch
25506a0bff When a module is added via the state system the local state context is
updated
2011-12-02 21:33:57 -07:00
Thomas S Hatch
d346e2a965 Add module reloading for an active minion 2011-12-02 18:25:05 -07:00
Thomas S Hatch
a9dab6d77e clean up extra whiteline 2011-12-02 16:33:15 -07:00
Thomas S Hatch
89c7fefae3 Merge pull request #312 from epoelke/develop
added better openbsd support to grains
2011-12-02 15:30:21 -08:00
Eric Poelke
aa4925496d removed whitespace from last commit. 2011-12-02 15:16:15 -08:00
Eric Poelke
7490a7975f added better support for OpenBSD in grains/core.py, updated freebsd specific functions to work with either freebsd or openbsd. 2011-12-02 14:56:25 -08:00
Thomas S Hatch
2090aa9611 repair indent error 2011-12-02 08:20:00 -07:00
Thomas S Hatch
cb9c6d333e Merge pull request #311 from metaRx/develop
Added try: to modules.useradd.info to fix exception error
2011-12-02 06:56:46 -08:00
Thomas S Hatch
642f426f9b Merge pull request #310 from SEJeff/misc-cleanups
Misc cleanups round 2
2011-12-02 06:55:28 -08:00
Mitch Anderson
9cc140d539 Added try: to modules.useradd.info to fix exception error when user did
not exist
2011-12-02 01:22:35 -07:00
Jeff Schroeder
d589b6513e Add modules.grains.list and change the default outputter
Just make the grains module a bit friendlier. Also, since  the
default output of: salt-call -g is yaml, do the same in output
of: salt-call grains.items

Indent all json printed out from salt-call by 2 characters
2011-12-01 23:05:00 -08:00
Jeff Schroeder
68e8088e31 Fix 2 tracebacks in salt-call
root@desktopmonster:/home/jeff/git/salt/salt/grains# salt-call grains.bogus
Function grains.itez is not available
Traceback (most recent call last):
  File "/home/jeff/git/salt/scripts/salt-call", line 18, in <module>
    main()
  File "/home/jeff/git/salt/scripts/salt-call", line 15, in main
    client.run()
  File "/home/jeff/git/salt/salt/cli/__init__.py", line 567, in run
    caller.run()
  File "/home/jeff/git/salt/salt/cli/caller.py", line 95, in run
    ret = self.call()
  File "/home/jeff/git/salt/salt/cli/caller.py", line 35, in call
    ret['return'] = self.minion.functions[self.opts['fun']](
KeyError: 'grains.bogus'

root@desktopmonster:/home/jeff/git/salt/salt/grains# salt-call grains.item
DEBUG: fun=grains.item
arg=[]
Traceback (most recent call last):
  File "/home/jeff/git/salt/scripts/salt-call", line 18, in <module>
    main()
  File "/home/jeff/git/salt/scripts/salt-call", line 15, in main
    client.run()
  File "/home/jeff/git/salt/salt/cli/__init__.py", line 567, in run
    caller.run()
  File "/home/jeff/git/salt/salt/cli/caller.py", line 91, in run
    ret = self.call()
  File "/home/jeff/git/salt/salt/cli/caller.py", line 35, in call
    *self.opts['arg']
TypeError: item() takes exactly 1 argument (0 given)
2011-12-01 22:39:59 -08:00
Thomas S Hatch
10d37cec2a Merge pull request #309 from epoelke/develop
Updated yumpkg.py and yumpkg5.py to reflect SEJeff's changes to grains.
2011-12-01 22:17:52 -08:00
Eric Poelke
d4f210714c Updated yumpkg.py and yumpkg5.py to reflect SEJeff's changes to grains. 2011-12-01 23:10:38 -08:00
Thomas S Hatch
4e10246f54 some minor string cleanup 2011-12-01 23:05:51 -07:00
Thomas S Hatch
7a0e931135 Merge pull request #308 from SEJeff/misc-cleanups
Misc cleanups and a few nice new features
2011-12-01 21:57:54 -08:00
Jeff Schroeder
d7c5ee57c0 Change the default salt-call -g output to yaml 2011-12-01 21:46:35 -08:00
Jeff Schroeder
aad52f503b Properly print non-strings with the TxtOutputter
After adding support for using different outputters for salt-call -g,
I noticed it would blow up with ran with --text-out as pythonpath
and cpu_flags aren't strings. Now just print the equiv of repr()
on non-strings and all will be well.
2011-12-01 21:37:12 -08:00
Jeff Schroeder
7a899b9236 Support --yaml-out, --json-out, and --raw-out for salt-call -g 2011-12-01 21:37:08 -08:00
Jeff Schroeder
ba03a830c5 Strip trailing \n off of lsb_* grains 2011-12-01 21:37:04 -08:00
Jeff Schroeder
770ced5573 For Linux, add the osrelease and oscodename grains
This uses the 'platform' module and will  also  use
that module to determine the 'os' grain if it can't
be figured out manually with the  *-release  files.
2011-12-01 21:36:59 -08:00
Thomas S Hatch
0a84a71d3a Merge pull request #307 from epoelke/develop
Develop
2011-12-01 21:26:04 -08:00
Eric Poelke
5acdde9768 Merge branch 'develop' of git://github.com/saltstack/salt into develop
Conflicts:
	salt/grains/core.py
2011-12-01 22:15:13 -08:00
Eric Poelke
6454af4a25 Added grain to detect release on RHEL based systems, updated grainmap in modules/service. Added yumpkg5 module to deal with RHEL 5 based systems lack of yum/rpm python26 support. This is the old yum.py module that just does a shell out can calls the yum CLI tool. 2011-12-01 13:03:21 -08:00
Thomas S Hatch
407541c8b9 Merge pull request #303 from ktenney/ignore-tweakage
Ignore tweakage
2011-12-01 09:14:47 -08:00
Thomas S Hatch
a189c745fa Merge pull request #302 from ktenney/cash4typos
add missing 'import re' statement
2011-12-01 09:14:16 -08:00
Eric Poelke
2c145c094e Merge branch 'develop' of git://github.com/saltstack/salt into develop 2011-12-01 08:22:32 -08:00
Kent Tenney
c9a5a498f8 add ignores for vim *.swp files, sphinx generated doc/_build/ 2011-12-01 10:09:03 -06:00
Kent Tenney
62d9435356 Merge branch 'develop' of git://github.com/saltstack/salt into cash4typos 2011-12-01 10:00:51 -06:00
Thomas S Hatch
d6db62191c Merge pull request #301 from ktenney/allow-numeric-id
stringify the minions 'id:' declaration
2011-12-01 07:03:11 -08:00
Kent Tenney
72ae179824 add missing 'import re' statement 2011-12-01 09:02:51 -06:00
Kent Tenney
99ba9b9c8d stringify the minions 'id:' declaration 2011-12-01 08:40:48 -06:00