Bug 935533 - Prepare infra to handle spot instances