Browse code
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
Mehdi Abaakouk authored on 2016/02/23 20:57:02Showing 1 changed files
| ... | ... |
@@ -108,6 +108,7 @@ KEYSTONE_SERVICE_PROTOCOL=${KEYSTONE_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
|
| 108 | 108 |
# Bind hosts |
| 109 | 109 |
KEYSTONE_ADMIN_BIND_HOST=${KEYSTONE_ADMIN_BIND_HOST:-$KEYSTONE_SERVICE_HOST}
|
| 110 | 110 |
# Set the tenant for service accounts in Keystone |
| 111 |
+SERVICE_TENANT_NAME=${SERVICE_TENANT_NAME:-service}
|
|
| 111 | 112 |
SERVICE_PROJECT_NAME=${SERVICE_TENANT_NAME:-service}
|
| 112 | 113 |
|
| 113 | 114 |
# if we are running with SSL use https protocols |