From 4bd5b591d48ebbfc9306aca4d952e82cb6e145ab Mon Sep 17 00:00:00 2001 From: Joe Buck Date: Sat, 3 Aug 2013 17:16:52 -0700 Subject: [PATCH] rgw.py: add None object check when parsing info The rgw task was failing to check for a None object when parsing user info in the case where there were config options set for the client that did not include user info (e.g. valgrind: ). --- teuthology/task/rgw.py | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/teuthology/task/rgw.py b/teuthology/task/rgw.py index f48d860db969f..177e81167ba68 100644 --- a/teuthology/task/rgw.py +++ b/teuthology/task/rgw.py @@ -350,20 +350,23 @@ def configure_users(ctx, config): if not c_config: continue user_info = extract_user_info(c_config) - log.debug('Creating user {user} on {client}'.format( - user=user_info['system_key']['user'],client=client)) - rgwadmin(ctx, client, - cmd=[ - '-n', client, - 'user', 'create', - '--uid', user_info['system_key']['user'], - '--access-key', user_info['system_key']['access_key'], - '--secret', user_info['system_key']['secret_key'], - '--display-name', user_info['system_key']['user'], - '--system', - ], - check_status=True, - ) + + # if user_info was successfully parsed, use it to create a user + if user_info is not None: + log.debug('Creating user {user} on {client}'.format( + user=user_info['system_key']['user'],client=client)) + rgwadmin(ctx, client, + cmd=[ + '-n', client, + 'user', 'create', + '--uid', user_info['system_key']['user'], + '--access-key', user_info['system_key']['access_key'], + '--secret', user_info['system_key']['secret_key'], + '--display-name', user_info['system_key']['user'], + '--system', + ], + check_status=True, + ) yield -- 2.39.5