From: Sage Weil Date: Thu, 18 Mar 2021 20:11:38 +0000 (-0400) Subject: Merge PR #40048 into master X-Git-Tag: v17.1.0~2562 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0461b061d5a95c190a36c38e933190cfc5c6bf9e;p=ceph.git Merge PR #40048 into master * refs/pull/40048/head: mgr/cephadm: stop conflicting daemon when deploying to a specific port mgr/cephadm: make DaemonPlacement print nicer mgr/cephadm: fix --force remove comment mgr/cephadm/schedule: choose an IP from a subnet list mgr/cephadm: rgw: clean up config and config-key values on removal mgr/cephadm: rgw: drop .crt extension when storing cert in config-key mgr/cephadm/services: allow beast/civetweb to bind to a particular IP python-common: add 'networks' property to ServiceSpec mgr/cephadm/schedule: match placement ip only combination with port Reviewed-by: Sebastian Wagner Reviewed-by: Juan Miguel Olmo --- 0461b061d5a95c190a36c38e933190cfc5c6bf9e