Oracle Corp and VMware Inc on Monday announced a deal designed to resolve years of tension over how Oracle handles technical support for VMware users and make it easier for them to move to Oracle's cloud computing service.