Add local-up support
Add vSphere support