Edits to work with new deployment of openstack, but still hopefully remain backwards compatible.