Merge PR #31832 into master

* refs/pull/31832/head:
	ceph-daemon: fix extract_uid_gid

Reviewed-by: Michael Fritch <mfritch@suse.com>
This commit is contained in:
Sage Weil 2019-11-23 20:25:52 -06:00
commit dcb7ce5f26

View File

@ -507,7 +507,7 @@ def extract_uid_gid():
out = CephContainer(
image=args.image,
entrypoint='/usr/bin/grep',
args=['ceph', '/etc/passwd'],
args=['^ceph:', '/etc/passwd'],
).run()
(uid, gid) = out.split(':')[2:4]
return (int(uid), int(gid))