From: Joe Buck <jbbuck@gmail.com>
Date: Sun, 4 Aug 2013 00:16:52 +0000 (-0700)
Subject: rgw.py: add None object check when parsing info
X-Git-Tag: 1.1.0~1995^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4bd5b591d48ebbfc9306aca4d952e82cb6e145ab;p=teuthology.git

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: ).
---

diff --git a/teuthology/task/rgw.py b/teuthology/task/rgw.py
index f48d860db..177e81167 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