adding support for openstack tenants and removing auth