Description of problem: Enhanced support customer is requesting a queens backport of the following fix: [1] - https://bugs.launchpad.net/os-brick/+bug/1921381 [2] - https://review.opendev.org/q/I066d456fb1fe9159d4be50ffd8abf9a6d8d07901 [3] - https://bugzilla.redhat.com/show_bug.cgi?id=1943146 [4] - https://bugzilla.redhat.com/show_bug.cgi?id=1942974
*** This bug has been marked as a duplicate of bug 1943181 ***