From: Sage Weil Date: Tue, 25 May 2021 20:17:44 +0000 (-0400) Subject: Merge PR #41007 into master X-Git-Tag: v17.1.0~1854 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9ab9cc26e200cdc3108525770353b91b3dd6c6d8;p=ceph-ci.git Merge PR #41007 into master * refs/pull/41007/head: qa/tasks/cephfs/test_nfs: fix info test doc/cephfs/fs-nfs-exports: document --ingress --virtual-ip mgr/nfs: move ingress vs virtual_ip check to cluster interface PendingReleaseNotes: clarify deprecated PendingReleaseNotes: note breaking CLI changes doc/cephadm/nfs: document nfs+ingress qa/suites/rados/cephadm/smoke-roleless: test nfs, nfs + ingress mgr/nfs: take --ingress argument to 'nfs cluster create' mgr/cephadm: adjust debug output for device refresh mgr/cephadm: ingress: fix log msg mgr/cephadm: fix logging of config/placement errors common/options: enable nfs module for new clusters cephadm: --stop-signal=SIGTERM mgr/orchestrator: default nfs pool, namespaces mgr/cephadm: nfs: create pool if it doesn't yet exist doc/cephadm/nfs: update mgr/nfs: change 'nfs cluster info' mgr/nfs: take optional virtual_ip for deploying ingress mgr/nfs: remove 'nfs cluster update' mgr/nfs: factor out ganesha pool creation mgr/nfs: delete -> rm for CLI mgr/nfs: add some type annotations python-common: fix IngressSpec yaml dump mgr/cephadm: ingress: remove eth0 default qa/tasks/cephadm: allow mounting volumes in shell cephadm: add -v arg to shell qa/tasks/vip: add 'vip.exec' task mgr/orchestrator: add --port arg to 'orch apply nfs' mgr/cephadm: nfs: add purge mgr/cephadm: ingress: support nfs mgr/cephadm: do not reconfigure daemons on deleted services mgr/cephadm: nfs: shell out to rados tool for conf creation mgr/cephadm: nfs: add rank to grace file from mgr module mgr/cephadm: nfs: bind ganesha to appropriate ip:port mgr/cephadm: enable ranked daemons for nfs mgr/cephadm: support creation of daemons with ranks mgr/cephadm: make _plan show removed daemon names mgr/cephadm/schedule: assign/map ranks mgr/cephadm: add rank[_generation] properties mgr/cephadm/inventory: store optional rank_map along with specs mgr/cephadm: include service_name is generated DaemonDescription mgr/orchestrator: include service_name in DaemonDescription dump mgr/cephadm/inventory: fix deleted check mgr/cephadm: simplify mgr/cephadm/schedule: make placement shuffle deterministic mgr/cephadm: document CephadmService flags Reviewed-by: Michael Fritch Reviewed-by: Varsha Rao --- 9ab9cc26e200cdc3108525770353b91b3dd6c6d8