Merge pull request #2843 from jsmartin/devel

Riak module docs and bugfixes.
pull/2848/head
Michael DeHaan 12 years ago
commit f34044e8c2

@ -61,7 +61,7 @@ options:
type: 'bool' type: 'bool'
wait_for_ring: wait_for_ring:
description: description:
- Waits for all nodes to agreee on the status of the ring - Waits for all nodes to agree on the status of the ring
required: false required: false
default: null default: null
aliases: [] aliases: []
@ -107,6 +107,7 @@ def ring_check():
def status_to_json(): def status_to_json():
# remove all unnecessary symbols and whitespace # remove all unnecessary symbols and whitespace
stats = ''
rc, out, err = module.run_command("riak-admin status 2> /dev/null") rc, out, err = module.run_command("riak-admin status 2> /dev/null")
if rc == 0: if rc == 0:
raw_stats = out raw_stats = out
@ -248,7 +249,7 @@ def main():
rc, out, err = module.run_command('riak-admin cluster commit %s' % target_node) rc, out, err = module.run_command('riak-admin cluster commit %s' % target_node)
if rc == 0: if rc == 0:
result['commit'] = out result['commit'] = out
changed = True result['changed'] = True
else: else:
module.fail_json(msg=out) module.fail_json(msg=out)

Loading…
Cancel
Save