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

Story: 2010248
Task: 46083

Change-Id: I0241afbb3ce0b5690fbe7821afc71be2c9b5ee31