From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 12 May 2020 18:59:51 +0000 (-0700)
Subject: Merge PR #34978 into master
X-Git-Tag: wip-pdonnell-testing-20200918.022351~1296
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=01aea7f7e15f208a7bb740d5267b0b56a220983f;p=ceph-ci.git

Merge PR #34978 into master

* refs/pull/34978/head:
	qa/tasks/cephfs/mount.py: always setup the NAT rules
	qa/tasks/cephfs/mount.py: fall back to use ip command to setup the bridge

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
---

01aea7f7e15f208a7bb740d5267b0b56a220983f