Merge PR #41151 into pacific

* refs/pull/41151/head:
	mgr/cephadm: ceph-volume verbose only when fails
	qa/workunits/cephadm/test_cephadm: test zap-osds
	cephadm: add --zap-osds argument to rm_cluster
	cephadm: implement zap-osds --fsid ... command
	doc/cephadm: add podman version note to install
	mgr/cephadm: check hostname resolution before adding host
	cephadm: provide a way to checkhost connection without /etc/hosts passed the shell
	doc/cephadm: remove /etc/hosts from list of hostname resoltion methods
	qa/suites/rados/cephadm/smoke-roleless: test client-keyring
	qa/tasks/cephadm.py: adjust client.admin key mode; place on all hosts
	cephadm: distribute client.admin keyring+conf to label:_admin on bootstrap
	doc/cephadm: document the default 'admin' label
	mgr/cephadm: 'ceph orch client-keyring ...' commands to manage keyring files
	mgr/cephadm: reimplement ceph.conf pushing
	mgr/cephadm: use _write_remote_file for ceph.conf
	mgr/cephadm: _write_remote_file helper
	mgr/cephadm: add placementspec for which hosts get ceph.conf
	mgr/cephadm: skip ok-to-stop for mons in upgrade if < 3 mons
	mgr/cephadm: don't allow upgrade start with less than 2 mgrs
	cephadm: re-assimilate user provided conf after mgr created
	cephadm: allow several public networks be matched
	mgr/cephadm: The command of 'ceph orch daemon restart mgr.xxx' may case mgr daemon loop to restart
	doc/cephadm: add a single word
	doc/cephadm: adding "device" to a sentence
	doc/cephadm: rewrite "nfs.rst"
	mgr/cephadm: s/_hosts_with_daemon_inventory/_schedulable_hosts/
	mgr/cephadm: don't remove daemons from hosts in maintenance or offline  mode
	mgr/cephadm: default status for daemons on maintenance hosts to stopped
	qa/tasks/cephadm: fix ctx archive check for teuthology
	python-common: use OrderedDict instead of Set to remove duplicates from host labels list
	mgr/cephadm: less noise about osd specs
	mgr/cephadm: kick serve loop when adding/removing labels
	mgr/cephadm: do not place osds on _no_schedule hosts
	doc/cephadm: document _no_schedule label
	mgr/cephadm: fix 'orch ls' count to reflect schedulable hosts
	mgr/cephadm: do not schedule on _no_schedule hosts
	doc/cephadm: osd.rst -- removing colons
	doc/cephadm: osd: rewrite "additional opts"
	doc/cephadm: rewrite "advanced osd s. specs"
	doc/cephadm: rewrite "delcarative state" in osd.rst
	mgr/MgrStandby: fix config observer
	mgr/MgrStandby: respawn if mgr_standby_modules changes
	qa/tasks/mgr/test_dashboard: skip test_standby if mgr_standby_modules=false
	qa/suites/rados/cephadm/smoke-*: use cephadm.wait_for_service
	qa/suites/rados/cephadm/smoke-singlehost: test --single-host-defaults
	cephadm: add --single-host-defaults option to bootstrap
	mgr/cephadm: allow mgr colo if mgr_standby_modules=false
	mgr/MgrStandby: add mgr_standby_modules option
	cephadm: ignore apparmor if profiles file is empty

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>

diff --cc src/common/options.cc
Simple merge