After the discussion in the barclamp-swift review, I think we need the same behavior here where we don't have just unclaimed disks, but unclaimed disks + disks owned by cinder in this list.