From: Sage Weil <sage@newdream.net>
Date: Thu, 18 Feb 2021 17:38:43 +0000 (-0500)
Subject: Merge PR #39304 into master
X-Git-Tag: v17.1.0~2933
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=64de5e6e65b7921def4f14c98c21a8d634472ad7;p=ceph.git

Merge PR #39304 into master

* refs/pull/39304/head:
	qa/tasks/ceph: set ctx.ceph[cluster_name].fsid
	qa/tasks/rgw: pass fsid to rgw daemon
	qa/suites/upgrade/octopus-x: reenable ragweed
	qa/suites/upgarde/octopus-x: rename yaml file

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
---

64de5e6e65b7921def4f14c98c21a8d634472ad7