From a2d9ce52586f1796887b4afd0737ab6be4c8b478 Mon Sep 17 00:00:00 2001 From: liusheng Date: Tue, 23 Feb 2016 16:12:17 +0800 Subject: [PATCH] Change the SERVICE_TENANT_NAME to SERVICE_PROJECT_NAME The intergation test job has been broken, it seems because the replace TENANT => PROJECT change in devstack scrpts, see[1]. This patch change the SERVICE_TENANT_NAME to SERVICE_PROJECT_NAME in devstack plugin. [1] https://review.openstack.org/#/c/281779/ Closes-Bug: #1548634 Change-Id: I9c7d1a6d28510e5d42deb4aa0280e8a48f042a4d Depends-On: Ibb1f78d47311117f6718707c5961bc2841473924 --- devstack/plugin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index f1a8cc645..21074bcf9 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -198,7 +198,7 @@ function configure_aodh { iniset $AODH_CONF service_credentials user_domain_id default iniset $AODH_CONF service_credentials project_domain_id default iniset $AODH_CONF service_credentials password $SERVICE_PASSWORD - iniset $AODH_CONF service_credentials project_name $SERVICE_TENANT_NAME + iniset $AODH_CONF service_credentials project_name $SERVICE_PROJECT_NAME iniset $AODH_CONF service_credentials region_name $REGION_NAME iniset $AODH_CONF service_credentials auth_url $KEYSTONE_SERVICE_URI