From: Sage Weil Date: Thu, 15 Jul 2021 15:05:22 +0000 (-0400) Subject: Merge PR #42073 into master X-Git-Tag: v17.1.0~1390 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=954abbe5e24f4abc54e179447d02b33f8f457e40;p=ceph.git Merge PR #42073 into master * refs/pull/42073/head: doc/mgr/nfs: fix 'export apply', pool name PendingReleaseNotes: document workaround for NFS storage change qa/tasks/mgr/test_orchestrator_cli: fix test qa/suites/orch/cephadm/mgr-nfs-upgrade: add test for nfs migration mgr/cephadm: migrate nfs grace file mgr/nfs: migrate pre-pacific nfs.ganesha-foo clusters to nfs.foo doc/cephfs/fs-nfs-exports: document new export apply capabilities qa/tasks/cephfs/test_nfs: define NFS_POOL_NAME mgr/nfs: use NFS_POOL_NAME in test_nfs.py mgr/nfs: test export apply on JSON list mgr/nfs: add test for ganesha conf apply/import qa/tasks/cephfs/test_nfs: retry mount a few times mgr/cephadm: migrate all legacy nfs exports to new .nfs pool mgr/nfs: adjust cephfs export caps if necessary python-common: don't accept pool/ns for NFSServiceSpec mgr/orchestrator: drop rados_config_location ServiceDescription property mgr/cephadm: move rados_config_location() out of NFSServiceSpec mgr/nfs: change nfs pool to .nfs mgr/nfs/export: accept a JSON or ganesha EXPORT config mgr/nfs: allow 'nfs export apply' to take a list of exports python-common: remove pool + namespace from NFSServiceSpec mgr/nfs: used fixed pool + ns mgr/rook: used fixed pool + ns mgr/dashboard: use fixed pool + ns mgr/cephadm: always use fixed pool and namespace mgr/nfs: adjust test to match pool name mgr/nfs: always create ganesha pool with well-defined name Reviewed-by: Varsha Rao --- 954abbe5e24f4abc54e179447d02b33f8f457e40