CherryPick: https://review.opendev.org/c/openstack/magnum/+/854396

Story: 2010248
Task: 46086

Change-Id: Idd8b02df0e9191408a0757901d7e8785e952175b