From: Sage Weil Date: Fri, 26 Mar 2021 12:17:42 +0000 (-0500) Subject: Merge PR #40355 into pacific X-Git-Tag: v16.2.0~24 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7e73bae99fdcbacb3db39e1682893d9132f119e1;p=ceph.git Merge PR #40355 into pacific * refs/pull/40355/head: mgr/cephadm: Fix dashboard gateway configuration when using IPV6 qa/workunits/cephadm/test_cephadm: specify image separately mgr/cephadm: retry after JSONDecodeError in wait_for_mgr_restart() cephadm: prevent podman from breaking socket.getfqdn() qa/tasks/cephadm: use 'orch apply mon' to deploy mons qa/suites/rados/cephadm/upgrade: add centos upgrade on latest octopus mgr/cephadm/upgrade: do not crash if error races with user cancellation doc/cephfs/nfs: Add note about cephadm NFS-Ganesha daemon port cephadm: only bootstrap using image that matches cephadm version mgr/cephadm: redeploy daemons deployed using old image during upgrade mgr/cephadm: add container digests of mgr that deployed daemon to unit.meta Reviewed-by: Juan Miguel Olmo --- 7e73bae99fdcbacb3db39e1682893d9132f119e1