From: Sage Weil <sage@newdream.net>
Date: Mon, 13 Sep 2021 22:28:43 +0000 (-0400)
Subject: Merge PR #43136 into master
X-Git-Tag: v17.1.0~890
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=13238ade1323c8ea792fba878b642122825e4cb9;p=ceph.git

Merge PR #43136 into master

* refs/pull/43136/head:
	qa/tasks/kubeadm: change calico encap to IPIPCrossSubnet
	qa/suites/orch/rook/smoke: add host networking to matrix
	qa/tasks/rook: fix shadowing of config arg in rook_cluster()

Reviewed-by: Joseph Sawaya <jsawaya@redhat.com>
---

13238ade1323c8ea792fba878b642122825e4cb9