Posting the revert of the revert :) so we can eventually land this.
Not clear yet how these validations are causing this
https://bugs.launchpad.net/tripleo/+bug/1713832
This reverts commit 6c3ca0cf57.
Change-Id: I9e85ccefffa5edcee0dca58a53d782a5428c3d18