Cleaning this up to be more openstack-focused.