Updated for post-Havana OpenStack