From 0a74cb484c9110381b07fa609d04788bd8cfbf6a Mon Sep 17 00:00:00 2001 From: James Martin Date: Wed, 12 Mar 2014 21:26:16 -0400 Subject: [PATCH] Fixes various typos introduced in a9017af2bb648930e27bab52de12f9983411778c. Fixes odd encoding problem with wait_for_service. --- database/riak | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/database/riak b/database/riak index e1aedf25fb4..7ba4df3ea3a 100644 --- a/database/riak +++ b/database/riak @@ -124,9 +124,8 @@ def main(): wait_for_handoffs=dict(default=False, type='int'), wait_for_ring=dict(default=False, type='int'), wait_for_service=dict( - required=False, default=None, choices=['kv']) - ), - validate_certs = dict(default='yes', type='bool'), + required=False, default=None, choices=['kv']), + validate_certs = dict(default='yes', type='bool')) ) @@ -137,6 +136,7 @@ def main(): wait_for_handoffs = module.params.get('wait_for_handoffs') wait_for_ring = module.params.get('wait_for_ring') wait_for_service = module.params.get('wait_for_service') + validate_certs = module.params.get('validate_certs') #make sure riak commands are on the path @@ -231,7 +231,7 @@ def main(): module.fail_json(msg='Timeout waiting for handoffs.') if wait_for_service: - cmd = '%s wait_for_service riak_%s %s' % ( riak_admin_bin, wait_for_service, node_name) + cmd = [riak_admin_bin, 'wait_for_service', 'riak_%s' % wait_for_service, node_name ] rc, out, err = module.run_command(cmd) result['service'] = out @@ -250,5 +250,6 @@ def main(): # import module snippets from ansible.module_utils.basic import * +from ansible.module_utils.urls import * main()