From: Sage Weil Date: Mon, 7 Jun 2021 18:44:27 +0000 (-0500) Subject: Merge PR #41684 into pacific X-Git-Tag: v16.2.5~87 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ea889d34a14fd0a29df1a81f3ba767f942937496;p=ceph.git Merge PR #41684 into pacific * refs/pull/41684/head: cephadm: improve is_container_running() mgr/cephadm:fix alerts sent to wrong URL mgr/cephadm: Warn about OSDs to be deleted manually when deleting an OSD service doc: add ceph-nfs link mgr: Fix orch osd rm stop help message mgr/cephadm/inventory: do not try to resolve current mgr host pybind/mgr/mgr_module: make get_mgr_ip() return mgr's IP from mgrmap mgr/restful: use get_mgr_ip() instead of hostname doc/cephadm: s/the the/the doc/cephadm: enriching "daemon status" doc/cephadm: enriching "Service Specification" mgr/cephadm: Don't call _check_host without hosts cephadm: stop passing --no-hosts to podman mgr/nfs: use host.addr for backend IP where possible mgr/cephadm: convert host addr if non-IP to IP mgr/dashboard,prometheus: new method of getting mgr IP doc/cephadm: remove any reference to the use of DNS or /etc/hosts mgr/cephadm: use known host addr mgr/cephadm: resolve IP at 'orch host add' time doc/cephadm: enrich "service status" doc/cephadm: recommend redeploying monitoring stack daemon after changing image cephadm: clean-up error message cephadm: raise an error when `--config` file is not found cephadm: manage cephadm log with logrotated mgr/cephadm: progress item for service apply mgr: expose ceph.conf path to modules common/config: track the path to the conf file we loaded 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 doc/cephadm: fix prompts in service-management.rst qa/tasks/cephadm: Include bootstrap registry options for downstream qa/suites/rados: include rook test in rados Reviewed-by: Juan Miguel Olmo Reviewed-by: Avan Thakkar --- ea889d34a14fd0a29df1a81f3ba767f942937496