Clean up nova-data role

names, whitespace, logic changes, failed_when.