From 13fe6f59d1b6d209bf770b0959d408ee1a8fb659 Mon Sep 17 00:00:00 2001 From: Mehdi Abaakouk Date: Tue, 23 Feb 2016 12:57:02 +0100 Subject: [PATCH] Fix telemetry integration gate jobs Since https://review.openstack.org/#/c/281779/2 have been merged the telemetry integration job is broken. Unfortunatly, it can't be fixed on our side, because we have to rename SERVICE_TENANT_NAME in many devstack plugin, we can't merge thing until all plugins have been fixed. So this change restores SERVICE_TENANT_NAME, to be able to switch to SERVICE_PROJECT_NAME. Related-bug: #1548634 Change-Id: I14ebf23aa63f0f153b934ad213a6209d22e73e9d --- lib/keystone | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/keystone b/lib/keystone index e33081cd9f..ff9714fe4d 100644 --- a/lib/keystone +++ b/lib/keystone @@ -108,6 +108,7 @@ KEYSTONE_SERVICE_PROTOCOL=${KEYSTONE_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL} # Bind hosts KEYSTONE_ADMIN_BIND_HOST=${KEYSTONE_ADMIN_BIND_HOST:-$KEYSTONE_SERVICE_HOST} # Set the tenant for service accounts in Keystone +SERVICE_TENANT_NAME=${SERVICE_TENANT_NAME:-service} SERVICE_PROJECT_NAME=${SERVICE_TENANT_NAME:-service} # if we are running with SSL use https protocols