Clean up nova-data role

names, whitespace, logic changes, failed_when.
Merge pull request #581 from blueboxgroup/nova-data-cleanup

Clean up nova-data role