Allow for OS_TENANT_NAME or _ID from env