Current cloud computing infrastructure typically assumes a homogeneous collection of commodity hardware, with details about hardware variation intentionally hidden from users. In this paper, we present our approach for extending the traditional notions of cloud computing to provide a cloud-based access model to clusters that contain a heterogeneous architectures and accelerators. We describe our ongoing work extending the OpenStack cloud computing stack to support heterogeneous architectures and accelerators, and our experiences running OpenStack on our local heterogeneous cluster testbed.