This is a backport of the patch: https://review.openstack.org/#/c/532525/4 Change-Id: I17af91d6041c4e41f6d479da742e96ea45ae31f7 Signed-off-by: Manuel Buil <mbuil@suse.com>