Revert "Clean up nova-data role"

This reverts commit c2b714c2a8d64150386ec0876ce178cb48219056.