Commit Graph

7471 Commits

Author SHA1 Message Date
Thomas S Hatch
d2aef12b7d Merge pull request #2418 from ffa/demo_module_reporting_standard
Demo of saltstack/salt#2417 module standards choice "1"
2012-11-01 10:29:01 -07:00
Seth House
40ccf0f9f4 Added logging exception to except Exception block 2012-11-01 09:46:04 -06:00
Seth House
8c6acd173e Fixed two small syntax errors 2012-11-01 09:43:55 -06:00
Thomas S Hatch
4425aa1170 Restructure redis returner, since it did notwork before anyway 2012-11-01 01:11:51 -06:00
ffa
019afc0e80 misc bug fixes 2012-10-31 23:13:25 -07:00
ffa
7625ebe429 add integration test to test failure 2012-10-31 22:56:59 -07:00
ffa
7ab7c28087 Use a salt extended exception 2012-10-31 22:36:04 -07:00
ffa
79cacbad1e bug fix and integration tests for git 2012-10-31 22:33:07 -07:00
Thomas S Hatch
1ef1b2fdc8 Add defaults for redis to the config module 2012-10-31 23:20:15 -06:00
ffa
ebc57b978f Demo of saltstack/salt#2417 module standards choice "1"
I left a note in "salt/modules/git.py" for the _git_run method.

For "salt/states/git.py", the two public methods illustrate the
two different methods utilizing the proposed module standards in
a salt state.

* "git.latest" uses "try[..]catch" blocks to return the error from the module
  as part of the state's return output.

* errors from modules called in "git.present" pass through to the minion which
  "[...]itself does catch all published executions exceptions and returns based
  on that information" [1]

As you will see, implementing the standard is quick, easy, simple, and non
invasive. In fact, most of my time was spent writing this commit message.

[1] thatch45, https://github.com/saltstack/salt/issues/2417#issuecomment-9969939
2012-10-31 21:50:37 -07:00
Thomas S Hatch
3b1574868e Add import comments 2012-10-31 22:28:31 -06:00
Jeff Schroeder
313b16aedd Merge pull request #2415 from tomyuk/develop
add missing _canonical_unit_name() in systemd provider status()
2012-10-31 19:44:22 -07:00
Tomoyuki Kano
c3a5830729 add missing _canonical_unit_name() in systemd provider status() 2012-11-01 10:23:14 +09:00
Thomas S Hatch
95daf9ce7e Pass opts into outputter system in the jobs runner 2012-10-31 17:30:06 -06:00
Thomas S Hatch
663d696560 Fix output error when opts not passed in 2012-10-31 16:56:57 -06:00
Thomas S Hatch
556d108ef5 Add initial code for external job cache 2012-10-31 16:49:56 -06:00
Thomas S Hatch
16640a8284 Merge pull request #2414 from UtahDave/develop
Fix group logic. Fixes #2353
2012-10-31 15:49:15 -07:00
David Boucha
bb6dafbd23 Fix group logic. Fixes #2353
This removes the default group from the group comparison
2012-10-31 16:44:25 -06:00
Thomas S Hatch
a67e253883 Add the MasterMinion class to be able to use minion side stuff
on the master
2012-10-31 16:33:11 -06:00
Thomas S Hatch
4723d7d5e9 fix some double quotes 2012-10-31 16:22:56 -06:00
Thomas S Hatch
f7051dd76f Add ext_job_cache option 2012-10-31 15:42:48 -06:00
Thomas S Hatch
be5ca89435 Merge pull request #2413 from jaypipes/working
Adds a note to starting_states tutorial explaining file.managed shortcut
2012-10-31 14:40:13 -07:00
Jay Pipes
ef5e11168c Adds a note to starting_states tutorial explaining file.managed shortcut
address issue #2412

Just adds a note section to the starting_states tutorial doc
page that explains the file.managed shortcut to make it a bit
easier for beginner Salt users to understand...
2012-10-31 16:47:58 -04:00
Thomas S Hatch
ee6dec7836 bump the redis returner to use the new config module 2012-10-31 14:45:18 -06:00
Thomas S Hatch
539e414730 Syntax error in assigning outputter to the ret data 2012-10-31 14:35:52 -06:00
Thomas S Hatch
20577b3705 Caller needs to pass the fun in the return dict 2012-10-31 14:34:25 -06:00
Thomas S Hatch
498d674409 update mongo returner to use the new config.option function 2012-10-31 14:27:33 -06:00
Thomas S Hatch
dcfcbec190 Add an option function to the config module 2012-10-31 14:27:33 -06:00
Thomas S Hatch
23e06bd312 Merge pull request #2410 from jaypipes/working
Tiny YAML correction in starting_states tutorial doc page.
2012-10-31 13:14:55 -07:00
Jay Pipes
0332c76147 Tiny YAML correction in starting_states tutorial doc page. 2012-10-31 16:11:54 -04:00
Thomas S Hatch
c6de148573 Don't pass through the minions grains back in the pillar 2012-10-31 14:07:14 -06:00
Thomas S Hatch
0e34406bd6 Fix missed components in mongo returner update 2012-10-31 14:03:48 -06:00
Thomas S Hatch
d8973cf7b1 Add pillar_opts to the default master config 2012-10-31 13:57:14 -06:00
Thomas S Hatch
fd35a3c505 update all returner refs to use the new format
Since gen_functions returns full strings we need to look up the
returner functions differently
2012-10-31 13:01:38 -06:00
Thomas S Hatch
8d87a200ff change returners to be a gen_functions loader 2012-10-31 13:01:38 -06:00
Thomas S Hatch
c4a1a440e3 Merge pull request #2409 from jcollie/nodegroups
Fix minion startup on 0.10.4+ for systems that have nodegroups defined.
2012-10-31 12:00:29 -07:00
Thomas S Hatch
881bf2d939 Update mongo_return to have get_jid and get_fun 2012-10-31 12:48:59 -06:00
Jeffrey C. Ollie
f15a6f7b7d Look for the nodegroup_comp function in the correct module. 2012-10-31 13:45:09 -05:00
Jeffrey C. Ollie
f57ee14530 Don't use a try/except block to check for functions which are unavailable on the master.
The try/except block here can hide attribute exceptions further down
the call chain.  Instead, explicitly check for the function using
hasattr so that attribute exceptions further down will trigger
tracebacks.
2012-10-31 13:45:03 -05:00
Thomas S Hatch
3e32531aa8 Merge pull request #2408 from UtahDave/develop
salt-master pidfile improvements Fixes #2395
2012-10-31 11:30:12 -07:00
David Boucha
51c5944cd7 chown the pidfile to the correct user 2012-10-31 12:23:29 -06:00
David Boucha
a235f79a3f Remove unnecessary pidfile removals 2012-10-31 12:14:40 -06:00
Thomas S Hatch
325c4124c2 Merge pull request #2405 from seanchannel/develop
add step to impport PPA key via wget / apt-key
2012-10-31 11:14:04 -07:00
Thomas S Hatch
638a450d97 Merge pull request #2404 from jcollie/develop
fix typo
2012-10-31 11:13:35 -07:00
Sean Channel
941b25cd9e add step to impport PPA key via wget / apt-key 2012-10-31 11:11:06 -07:00
Jeffrey C. Ollie
d63b083528 fix typo 2012-10-31 13:06:53 -05:00
Thomas S Hatch
c57a9551a0 Add returners to salt-call 2012-10-31 10:48:11 -06:00
Thomas S Hatch
22c0099a58 Merge pull request #2403 from rrada/develop
Fixed debian_service.status method
2012-10-31 08:48:19 -07:00
Radek Rada
a8b399daa5 Fixed debian_service.status method
Changes based on discussion from pull-req #2394
(https://github.com/saltstack/salt/pull/2394)

- if signature argument is set, use it to do a process lookup
- if signature argument is not set, use the startup script with "status"
argument

It's base on the rh_service.status method behavior.
2012-10-31 08:02:55 +01:00
Thomas S Hatch
0207e42c36 Add --return to salt-call 2012-10-30 15:23:40 -06:00