From: Sage Weil <sage@redhat.com>
Date: Thu, 26 Mar 2020 02:18:45 +0000 (-0500)
Subject: Merge PR #33581 into master
X-Git-Tag: v16.1.0~2793
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8d514b53a282222f8f028c2f820003afea52fda4;p=ceph.git

Merge PR #33581 into master

* refs/pull/33581/head:
	mgr/cephadm: add watch_url to NFS bootstrap config
	mgr/cephadm: check for an existing NFS config object
	mgr/cephadm: combine `get_daemon_name` and `get_rados_user` funcs
	mon: allow `auth caps` for `mgr` profile
	mgr/cephadm: add deployment example to NFS docs
	mgr/cephadm: add utils.py
	mgr/cephadm: create/update keyring during nfs config
	mgr/cephadm: pass NFSServiceSpec instead of pool/namespace args
	mgr/cephadm: add nfs apply test
	mgr/cephadm: fix nfs redeploy/reconfig
	mgr/cephadm: ensure nfs uses the correct entity
	mgr/cephadm: fix service name for nfs type
	mgr/cephadm: apply nfs service spec
	mgr/cephadm: don't create a unique nfs daemon name
	mgr/cephadm: update docs
	mgr/cephadm: add minimal caps for nfs client keyring
	mgr/cephadm: add logging to NFSGanesha class
	mgr/cephadm: create empty nfs rados config obj
	mgr/cephadm: add nfs tests
	mgr/cephadm: add a minimal ganesha.conf
	mgr/cephadm: deploy nfs-ganesha service
	mgr/cephadm: split out `config-and-keyrings` json
	mgr/orchestrator: rearrange interface to match impl. order

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

8d514b53a282222f8f028c2f820003afea52fda4