Clean-up delete code to re-try in case of OpenStack cluster hangs in deleting
Clean-up create to not blow up if disks are not defined in Vagrantfile