Merge pull request #43960 from guits/wip-53284-pacific

author Guillaume Abrioux <gabrioux@redhat.com>

Tue, 23 Nov 2021 16:43:39 +0000 (17:43 +0100)

committer GitHub <noreply@github.com>

Tue, 23 Nov 2021 16:43:39 +0000 (17:43 +0100)
author Guillaume Abrioux <gabrioux@redhat.com>
Tue, 23 Nov 2021 16:43:39 +0000 (17:43 +0100)
committer GitHub <noreply@github.com>
Tue, 23 Nov 2021 16:43:39 +0000 (17:43 +0100)
diff --cc src/ceph-volume/ceph_volume/tests/conftest.py
Simple merge
author	Guillaume Abrioux <gabrioux@redhat.com>
	Tue, 23 Nov 2021 16:43:39 +0000 (17:43 +0100)
committer	GitHub <noreply@github.com>
	Tue, 23 Nov 2021 16:43:39 +0000 (17:43 +0100)