From: Sage Weil Date: Wed, 14 Apr 2021 13:39:38 +0000 (-0400) Subject: Merge PR #40734 into master X-Git-Tag: v17.1.0~2265 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8cc5dc75d7a21fd6499d484ef9310cc7df4426e4;p=ceph.git Merge PR #40734 into master * refs/pull/40734/head: mgr/cephadm: make prometheus scrape ingress haproxy doc/cephadm: remove big warning about stability doc/cepham/compatibility: rgw-ha -> ingress; note possibility of breaking changes mgr/cephadm: ingress: add optional virtual_interface_networks doc/cephadm/rgw: clean up example spec mgr/cephadm/services/ingress: less verbose about prepare_create doc/cephadm/rgw: add note about which ethernet interface is used cephadm: make keepalived unit fiddle sysctl settings mgr/orchestrator: report external endpoints from 'orch ls' mgr/orchestrator: drop - when no ports doc/cephadm/rgw: update docs for ingress service mgr/cephadm: use per_host_daemon feature in scheduler mgr/cephadm/schedule: add per_host_daemon_type support mgr/cephadm: HA_RGW -> Ingress mgr/cephadm: include daemon_type in DaemonPlacement mgr/cephadm: update list-networks to report interface names too mgr/orchestrator: streamline 'orch ps' PORTS formatting mgr/cephadm/schedule: handle multiple ports per daemon mgr/cephadm/utils: resolve_ip(): prefer IPv4 Reviewed-by: Sebastian Wagner --- 8cc5dc75d7a21fd6499d484ef9310cc7df4426e4