From: Sage Weil <sage@redhat.com>
Date: Wed, 12 Aug 2015 20:43:38 +0000 (-0400)
Subject: ceph-disk: fix get_ceph_user
X-Git-Tag: v9.1.0~294^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aef00eb891db6febd548857f28f59ff241e5142f;p=ceph.git

ceph-disk: fix get_ceph_user

getpwnam throws an exception

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/ceph-disk b/src/ceph-disk
index 20be6673ff3d..d7b3233cff5c 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -713,9 +713,11 @@ def get_osd_id(path):
     return osd_id
 
 def get_ceph_user():
-    if pwd.getpwnam('ceph') and grp.getgrnam('ceph'):
+    try:
+        pwd.getpwnam('ceph')
+        grp.getgrnam('ceph')
         return 'ceph'
-    else:
+    except KeyError:
         return 'root'
 
 def path_set_context(path):