]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: fix how uid/gid is determined
authorPaul Cuzner <pcuzner@redhat.com>
Thu, 12 Dec 2019 21:52:19 +0000 (10:52 +1300)
committerSage Weil <sage@redhat.com>
Sun, 15 Dec 2019 19:00:27 +0000 (13:00 -0600)
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>
src/cephadm/cephadm

index 9af02a0a5be0e431a6ef391a2808861553ab123d..2f436f8c43c4ccf5c9854d71a4a038061e30c091 100755 (executable)
@@ -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: