Merge pull request #46729 from guits/wip-56084-pacific

author Guillaume Abrioux <gabrioux@redhat.com>

Fri, 8 Jul 2022 05:15:38 +0000 (07:15 +0200)

committer GitHub <noreply@github.com>

Fri, 8 Jul 2022 05:15:38 +0000 (07:15 +0200)
author Guillaume Abrioux <gabrioux@redhat.com>
Fri, 8 Jul 2022 05:15:38 +0000 (07:15 +0200)
committer GitHub <noreply@github.com>
Fri, 8 Jul 2022 05:15:38 +0000 (07:15 +0200)
diff --cc src/ceph-volume/ceph_volume/util/encryption.py
Simple merge
author	Guillaume Abrioux <gabrioux@redhat.com>
	Fri, 8 Jul 2022 05:15:38 +0000 (07:15 +0200)
committer	GitHub <noreply@github.com>
	Fri, 8 Jul 2022 05:15:38 +0000 (07:15 +0200)