Given that the upstream stable/wallaby backport was abandoned [1], we should fix this in 17.1 at least. I've copied this to 2152688 so that we can do the stable/wallaby and/or rhos-17.1 backport. I'm leaving this BZ open for a bit. Once the work is done for the 17.1 backport, we essentially get 17.0 for free (it should be a clean easy cherry-pick), so in case we decide to do a z2 release we can keep this BZ around. [1] https://review.opendev.org/c/openstack/nova/+/836016
Moving to 17.1 because it's reported internally and the backport to train upstream is very unlikely to happen, but the wallaby one is still realistic.