From: Paul Cuzner <pcuzner@redhat.com>
Date: Thu, 12 Dec 2019 21:52:19 +0000 (+1300)
Subject: cephadm: fix how uid/gid is determined
X-Git-Tag: v15.1.0~483^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=462525582d7b6cb2bcd4af8249ea13a53c4a81e8;p=ceph-ci.git

cephadm: fix how uid/gid is determined

The uid/gid is determined by looking at file ownership. It
was looking at /etc/ceph, but on current builds this is owned by root so switched to using /var/lib/ceph which
is the homedir of the ceph account.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 9af02a0a5be..2f436f8c43c 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -720,7 +720,7 @@ def get_container(fsid, daemon_type, daemon_id, privileged=False,
         cname='ceph-%s-%s.%s' % (fsid, daemon_type, daemon_id),
     )
 
-def extract_uid_gid(img='', file_path='/etc/ceph'):
+def extract_uid_gid(img='', file_path='/var/lib/ceph'):
     # type: (str, str) -> Tuple[int, int]
 
     if not img: