Merge PR #34192 into octopus

* refs/pull/34192/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: Michael Fritch <mfritch@suse.com>

diff --cc src/pybind/mgr/cephadm/module.py
index 7fab4a9a184a82c275965c29dbc4f03cac083161,3590af2605293bdaa78330833185a395b2894429..94e30cd4893b3601918fc4362e591e8911e2521e
--- 1/src/pybind/mgr/cephadm/module.py
--- 2/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@@ -31,10 -31,10 +31,10 @@@ import uui
  from ceph.deployment import inventory, translate
  from ceph.deployment.drive_group import DriveGroupSpec
  from ceph.deployment.drive_selection import selector
- from ceph.deployment.service_spec import HostPlacementSpec, ServiceSpec, PlacementSpec, \
-     assert_valid_host
+ from ceph.deployment.service_spec import \
+     HostPlacementSpec, NFSServiceSpec, ServiceSpec, PlacementSpec, assert_valid_host
  
 -from mgr_module import MgrModule
 +from mgr_module import MgrModule, HandleCommandResult
  import orchestrator
  from orchestrator import OrchestratorError, OrchestratorValidationError, HostSpec, \
      CLICommandMeta

diff --cc src/pybind/mgr/orchestrator/_interface.py
Simple merge

diff --cc src/pybind/mgr/orchestrator/module.py
Simple merge