Decouple neutron

this is just the neutron specific part of Soren's large patch. I am testing it separately b/c this is the only part of the code that should effect the current build code for base openstack.
It does look intentional, but I couldn't work out why.

Besides, public_cidr is always set, so there should be no functional difference.