Description of problem: This is a clone of https://bugzilla.redhat.com/show_bug.cgi?id=1765003 mainly due to the fact that we are backporting part of the associated patch to osp13, mainly for internal CI reason.
The osp13 bug is https://bugzilla.redhat.com/show_bug.cgi?id=1810119 which is needed for stable ci.
Closing EOL, OSP 15 has been retired as of Sept 19, 2020