From aef00eb891db6febd548857f28f59ff241e5142f Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Wed, 12 Aug 2015 16:43:38 -0400
Subject: [PATCH] ceph-disk: fix get_ceph_user

getpwnam throws an exception

Signed-off-by: Sage Weil <sage@redhat.com>
---
 src/ceph-disk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/ceph-disk b/src/ceph-disk
index 20be6673ff3df..d7b3233cff5c7 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):
-- 
2.39.5