d49c9349c1
... and remove a few remaining logics to support deployment without neutron. Change-Id: Id129a3894f3506862ea139c5221ae8bab029320e