Update to support cinder and quantum