From: Neha Ojha <nojha@redhat.com>
Date: Wed, 1 Dec 2021 18:51:14 +0000 (-0800)
Subject: Merge pull request #44161 from neha-ojha/wip-fix-upgrades
X-Git-Tag: v17.1.0~324
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cf829d02b247c5be5841331422517c2b376f2bb2;p=ceph.git

Merge pull request #44161 from neha-ojha/wip-fix-upgrades

qa/suites/upgrade/octopus-x: bunch of fixes and cleanup

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Reviewed-by: Sridhar Seshasayee <sseshasa@redhat.com>
---

cf829d02b247c5be5841331422517c2b376f2bb2