Add volumes to OpenStack Iaas + some cleanup