From: Sage Weil <sage@newdream.net>
Date: Tue, 21 Sep 2021 15:37:50 +0000 (-0400)
Subject: Merge PR #43156 into master
X-Git-Tag: v17.1.0~838
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6bf32314f75fffd4473705cfaebdf47aa2a9735d;p=ceph.git

Merge PR #43156 into master

* refs/pull/43156/head:
	qa/suites/orch/rook/smoke: add flannel back in

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
---

6bf32314f75fffd4473705cfaebdf47aa2a9735d