Revert "Allow either vif_id_on_device or vif_on_device"
Revert "Allow either vif_id_on_device or vif_on_device"

This reverts commit 424bfdf66105740660047f61729e3c45fc3488c8.

rackerlabs/melange,rackerlabs/melange,rackerlabs/melange