Commit Graph

7350 Commits

Author SHA1 Message Date
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
Thomas S Hatch
ca0904511f Catch authentication exceptions on the master 2012-10-30 15:14:05 -06:00
Thomas S Hatch
7db30d090a Fix outputter bug introduced with changes to yaml 2012-10-30 14:41:47 -06:00
Thomas S Hatch
304b1b145b Merge pull request #2400 from jesusaurus/develop
The puppet command requires a subcommand.
2012-10-30 13:36:04 -07:00
Jonathan Harker
0dcc859931 The puppet command requires a subcommand.
Specify the agent subcommand to puppet.
2012-10-30 13:35:29 -07:00
Thomas S Hatch
c8e79c9ac3 fix outputter test with changes to yaml outputter 2012-10-30 14:15:23 -06:00
Thomas S Hatch
48d774b8bd Add pillar_roots to the wheel system 2012-10-30 11:48:25 -06:00
Thomas S Hatch
53594f372a Change the YAML outputter to use block mode and add some docs 2012-10-30 11:42:35 -06:00
Thomas S Hatch
b58cc87a61 Add docs for the txt outputter 2012-10-30 11:37:00 -06:00
Thomas S Hatch
aff8eb9ea3 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-10-30 11:36:29 -06:00
Thomas S Hatch
5db2670d44 Merge pull request #2398 from s0undt3ch/develop
Fix tests.
2012-10-30 10:34:08 -07:00
Thomas S Hatch
4f7cc38317 Docs for the raw outputter 2012-10-30 11:31:17 -06:00
Thomas S Hatch
e8af582735 added docs to the pprint outputter 2012-10-30 11:28:38 -06:00
Thomas S Hatch
db2a594fc9 Document and clean up the salt key outputter 2012-10-30 11:25:43 -06:00
Thomas S Hatch
94173b2efc update json output docs 2012-10-30 11:20:56 -06:00
Pedro Algarvio
19d07bbba5 Fix tests in integration.shell.call. 2012-10-30 17:16:06 +00:00
Thomas S Hatch
a24580e20f Add docs to the highstate outputter 2012-10-30 11:12:29 -06:00
Pedro Algarvio
cfae86b744 Fix salt-key tests to comply with the new salt.key changes. 2012-10-30 17:09:50 +00:00
Pedro Algarvio
d057927ae4 "Migrate" salt-key -l functionality to salt.key.
Additionally, impose an order(sorted ignoring case) to the returned minion keys so we can know what to expect when testing output.
2012-10-30 16:48:21 +00:00
Thomas S Hatch
72617b2e07 Merge pull request #2392 from s0undt3ch/develop
Output function in Yaml outputter shold return data, not print. Fixes #2388
2012-10-30 08:39:53 -07:00
Pedro Algarvio
480cada169 Output function in Yaml outputter shold return data, not print. Fixes #2388. 2012-10-30 11:38:47 +00:00
Thomas S Hatch
dc7acd9cb4 write the master file when calling apply 2012-10-29 23:50:50 -06:00