From: Sage Weil <sage@redhat.com>
Date: Mon, 27 Jan 2020 17:39:53 +0000 (-0600)
Subject: Merge PR #32812 into master
X-Git-Tag: v15.1.0~31
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d32b0ad99db7c52cc02b59d5306afad015334051;p=ceph.git

Merge PR #32812 into master

* refs/pull/32812/head:
	mgr/cephadm: get --osd-uuid deploy arg from osdmap
	mgr/cephadm: fetch keyring in _create_daemon()

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

d32b0ad99db7c52cc02b59d5306afad015334051