Revert "Adjust nova to account for VLAN change to nova-networks cookbook"

This reverts commit 456aa59f5efb3c6c158eac416704f7ea61e7d1f5.
Merge pull request #327 from andymcc/vlan_fix

Revert "Adjust nova to account for VLAN change to nova-networks cookbook...