From: Sage Weil <sage@redhat.com>
Date: Mon, 16 Dec 2019 16:04:13 +0000 (-0600)
Subject: Merge PR #32198 into master
X-Git-Tag: v15.1.0~483
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ff115188179af1a24dff43405d6ca10e441781bd;p=ceph.git

Merge PR #32198 into master

* refs/pull/32198/head:
	cephadm: Fix Python2.7 isssue
	cephadm: fix how uid/gid is determined
	cephadm: add sample configuration for prometheus
	cephadm: support deployment of prometheus

Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

ff115188179af1a24dff43405d6ca10e441781bd