From: Sage Weil <sage@newdream.net>
Date: Mon, 19 Apr 2021 12:30:42 +0000 (-0400)
Subject: Merge PR #40817 into master
X-Git-Tag: v17.1.0~2205
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=56ade4769c52d2908d65287db52d23a184b79baa;p=ceph.git

Merge PR #40817 into master

* refs/pull/40817/head:
	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

Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

56ade4769c52d2908d65287db52d23a184b79baa