Commit Graph

8173 Commits

Author SHA1 Message Date
Thomas S Hatch
012462bee1 Add Reactors clas to utils.event 2012-11-23 13:51:55 -07:00
Thomas S Hatch
afea51ad1d Add reactors to the master config defaults 2012-11-23 13:51:36 -07:00
Thomas S Hatch
541a52abbf Make renderers pass through kwargs data 2012-11-23 13:00:09 -07:00
Thomas S Hatch
5cdffadd09 Merge pull request #2680 from s0undt3ch/develop
Fix bug introduced in 6c3b69cc56. Refs #2672.
2012-11-23 09:11:02 -08:00
Thomas S Hatch
e9ab6cc09b Merge pull request #2679 from s0undt3ch/issues/2677
Fix #2677
2012-11-23 09:04:50 -08:00
Pedro Algarvio
eacbdfdf93 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-11-23 17:02:18 +00:00
Pedro Algarvio
927f79eb94 Fix bug introduced in 6c3b69cc56. Refs #2672. 2012-11-23 16:58:45 +00:00
Thomas S Hatch
a343421f41 Merge pull request #2678 from s0undt3ch/develop
Add `tests.saltunittest.RedirectStdStreams`.
2012-11-23 08:53:31 -08:00
Thomas S Hatch
4f89835bee Merge pull request #2675 from UtahDave/add_mysql_returner_docs
Add MySQL returner docs
2012-11-23 08:44:46 -08:00
Pedro Algarvio
4597b7f605 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-11-23 16:13:11 +00:00
Pedro Algarvio
1f6d7f2c1c Disable DNS checks when using --local. Fixes #2677. 2012-11-23 16:08:02 +00:00
Pedro Algarvio
4fc12f58ee Fix salt.utils.fopen import error. 2012-11-23 12:33:28 +00:00
Pedro Algarvio
a6fd9bb60f Add tests.saltunittest.RedirectStdStreams.
* The `RedirectStdStreams` tests helper will allow to temporarily catch `stdout` and `stderr` output. Right now it's only used to **mute** the `tests.integration.runners.jobs.ManageTest.test_active()` output.
2012-11-23 12:19:09 +00:00
David Boucha
1db1287fab Add MySQL to list of returners.
Add MySQL to list of returners.
Improve formatting of docstring so it looks better
in the actual documentation.
Add python module requirement
2012-11-22 22:30:34 -07:00
Thomas S Hatch
b1427e1fc8 Merge pull request #2673 from UtahDave/add_mysql_returner_docs
Add MySQL schema to docstring
2012-11-22 20:28:17 -08:00
David Boucha
93ab9704c6 Add MySQL schema to docstring
Add a MySQL schema required for the returner to work
to the docstring
2012-11-22 21:17:11 -07:00
Thomas S Hatch
7ffccdd2a7 Merge pull request #2672 from bugi/develop
make it possible to add a user with uid/gid 0
2012-11-22 19:46:55 -08:00
Thomas S Hatch
0dfcee4ae9 Merge pull request #2671 from archtaku/ebuild
Add multiple package support for ebuild
2012-11-22 19:45:11 -08:00
Brian Grossman
6c3b69cc56 make it possible to add a user with uid/gid 0
Test uid and gid against None instead of plain falsity,
since uid/gid 0 is valid.
2012-11-22 20:33:41 -07:00
Thomas S Hatch
9db6b178b1 Merge pull request #2670 from techhat/baremetal
Adding partition module
2012-11-22 09:27:44 -08:00
Joseph Hall
ff7583d34a Adding partition module 2012-11-22 10:16:09 -07:00
Erik Johnson
adadbcef9f Add multiple package support for ebuild
Also, cleaned unnecessary module imports I had added to the package
providers before I had split out common package functions (metadata
parsing, etc) into the pkg_resource module.

And finally, some docstring corrections for the install functions.
2012-11-22 11:15:42 -06:00
Thomas S Hatch
04cf447d8b Merge pull request #2669 from opbeat/develop
Adds "replication" permission for postgres users.
2012-11-22 07:26:03 -08:00
Thomas S Hatch
d9620cdb9e Merge pull request #2668 from axiom/develop-remove-symlinks
Make remove in the file module also remove broken symlinks
2012-11-22 07:23:16 -08:00
Thomas S Hatch
849359c362 Merge pull request #2667 from kjkuan/develop
Simplify the handling of the stateful feature of the cmd state.
2012-11-22 07:19:26 -08:00
Ron Cohen
7d00619d45 Adds "replication" permission for postgres users. 2012-11-22 14:18:37 +01:00
Johannes Martinsson
e1bc7f2b5a Make remove in the file module also remove broken symlinks
The remove command in the file module had guard, `os.path.exists`, in
front of all remove actions. That guard failed on broken symlinks, i.e.
it returned `false` even though the broken symlink existed. Since the
remove actions are properly guarded without the `os.path.exists` guard,
this commits removes it. Now the remove command will also remove broken
symlinks.
2012-11-22 12:22:04 +01:00
Jack Kuan
e6ac64e219 Simplify the handling of the stateful feature.
Also fixed a bug in state.py along the way. The bug can be triggered
with this sls::

    watched:
      cmd.run:
        - name: echo "This state is being watched!"
        - cwd: /

    watching:
      cmd.wait:
        - name: echo "I'm watching...." >> /tmp/watching.txt
        - cwd: /
        - watch:
          - cmd: watched

    test:
      cmd.wait:
        - name: echo "do something"
        - cwd: /
        - watch:
          - cmd: watching
2012-11-22 02:25:09 -05:00
Thomas S Hatch
a49f1f1631 Merge pull request #2666 from techhat/extfs
Adding mkfs to extfs module
2012-11-21 19:16:44 -08:00
Joseph Hall
f8172dc353 Adding mkfs to extfs module 2012-11-21 19:17:56 -07:00
Thomas S Hatch
de578b1460 Merge pull request #2665 from UtahDave/add_mysql_returner
Add mysql returner Fixes #2664
2012-11-21 17:56:22 -08:00
David Boucha
e969a4c876 Remove some unneeded commented out code 2012-11-21 17:38:24 -07:00
David Boucha
86b09e925e Fill out ret module functions. Finish mysql_return
Finished mysql returner.

Filled out the ret module functions to match all functions
in the mysql returner. These should also work with the other
returners if they match the interface.
2012-11-21 17:38:24 -07:00
David Boucha
f62c80907d Fix get_jid query. verified working 2012-11-21 17:38:23 -07:00
David Boucha
6b62353426 Verified get_fun query now working. 2012-11-21 17:38:23 -07:00
David Boucha
d2f69c73ad get_fun query finally works 2012-11-21 17:38:23 -07:00
David Boucha
3556343cb2 Fix query 2012-11-21 17:38:23 -07:00
David Boucha
fe63f52c9e Much mo' betta' query 2012-11-21 17:38:23 -07:00
David Boucha
caee950a55 Fix command example. Remove single quotes 2012-11-21 17:38:23 -07:00
David Boucha
1e3f75aa0c Fetch one result when expecting one result 2012-11-21 17:38:23 -07:00
David Boucha
1a5127d68b add json.dumps before inserting in database 2012-11-21 17:38:23 -07:00
David Boucha
49547f489b Finished first draft of mysql returner 2012-11-21 17:38:23 -07:00
David Boucha
283b57ce01 Add json.dump of full return 2012-11-21 17:38:23 -07:00
David Boucha
8f215f14c3 Convert Redis Returner to MySQL Returner
returner works. still need to convert other functions
to work with mysql
2012-11-21 17:38:23 -07:00
Sean Channel
d805e6a01c Merge pull request #2663 from seanchannel/develop
log changes
2012-11-21 16:19:47 -08:00
Sean Channel
a4cec067ea log changes 2012-11-21 16:15:02 -08:00
Thomas S Hatch
613fc33121 Add option to pass in master opts directly to localclient 2012-11-21 16:48:18 -07:00
Thomas S Hatch
7292e48fc4 Merge pull request #2662 from seanchannel/develop
remove upstart files
2012-11-21 15:44:45 -08:00
Seth House
410a51742f Fix auth_check to also work for compound commands 2012-11-21 15:24:56 -07:00
Sean Channel
51895d6b1b remove upstart files 2012-11-21 14:16:59 -08:00