Fixing delete container for openstack to be robust