From: Sage Weil Date: Wed, 28 Apr 2021 15:44:21 +0000 (-0500) Subject: Merge PR #40922 into pacific X-Git-Tag: v16.2.2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=717ce59b76c659aaef8c5aec1355c0ac5cef7234;p=ceph.git Merge PR #40922 into pacific * refs/pull/40922/head: pybind/ceph_argparse: print --format flag name in help descs mgr/cephadm: don't list non ceph daemons as needing upgrade in upgrade check qa/tasks/cephadm: ignore --keep-logs failure qa/tasks/cephadm: use yaml.dump_all() qa/suites/rados/cephadm/smoke-*: use cephadm.wait_for_service qa/tasks/cephadm: tear down clsuter before gathering logs qa/suites/rados/cephadm/smoke-roleless: test rgw-ingress mgr/cephadm: remove virtual_ip check during scheduling mgr/orchestrator: orch ls: leave off virtual_ip prefixlen qa/tasks/cephadm: add wait_for_service qa/tasks/cephadm: allow skip_monitor_stack=true qa/tasks/cephadm: do subst_vip for cephadm.shell and .apply qa/tasks/vip: add vip task to allocate virtual IPs qa/suites/rados/cephadm/smoke-roleless: add rgw-ingress test case qa/tasks/cephadm: shell: take 'all-roles' or 'all-hosts' qa/tasks/cephadm: let cephadm.shell take string or list doc/cephadm: wrong command for single daemon events mgr/cephadm: place maximum on placement count based on host count mgr/cephadm: fix nfs-rgw stray daemon mgr/cephadm: skip-ssh flag enables cephadm mgr module mgr/cephadm: report exception during upgrade in upgrade status qa/suites/rados/thrash: shorten radosbench mgr/cephadm: remove old haproxy and keepalived templates mgr/orchestrator: validate lists in spec jsons python-common: Verify service spec is not None python-common: Verify data_devices is not None mgr/orchestrator: DG loads properly the unmanaged attribute mgr/orchestractor: rgw realm and zone flags must both be provided 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 doc/cephadm: rewrite "dry run" section in osd.rst doc/cephadm: rewrite part of "deploy osds" doc/cephadm: rewrite osd.rst "Remove an OSD" doc/cephadm: rewrite osd.rst - list devices doc/cephadm: break mon section into sections doc/cephadm: rewrite "deploying add. mons" doc: fixes for cephadm documentation doc/cephadm: remove warning about cephadm in production doc/cephadm: Add Compatibility with Podman Versions doc/cephadm: rewrite "index.rst" doc/cephadm: explicitly show host requirments in adding host section 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 cephadm: fix a typo 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 cephadm: cleanup extra slash in runtime dir cephadm: use split cgroup strategy for podman cephadm: use class to represent container engine mgr/cephadm: don't cleanup the daemon keyring on failed redeploy mgr/cephadm: fix orch host add with multiple labels and no addr doc/cephadm: remove keepalived_user from haproxy docs rpm: re-disable SUSE lttng build on z390x ceph.spec.in: enable tcmalloc and lttng on s390x Reviewed-by: Sebastian Wagner --- 717ce59b76c659aaef8c5aec1355c0ac5cef7234