From c10b8983bc9f60fe5bbd51a1066df5452127cb56 Mon Sep 17 00:00:00 2001 From: Mehdi Abaakouk Date: Thu, 20 Aug 2015 21:08:14 +0000 Subject: [PATCH] Revert "Use generic keystone uri in devstack ..." The keystone uri need to be without version for ceilometerclient, but with the version with the v2 keystonecient. This reverts commit a36b8ea4d9501ccb5af828b263e13f2f67ba5bcd. And instead we strip the version from the keystone uri for ceilometerclient. Change-Id: Ieda9da114817266c035c772972c884d7030cb3eb --- aodh/evaluator/threshold.py | 2 +- devstack/plugin.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aodh/evaluator/threshold.py b/aodh/evaluator/threshold.py index b74cbd34f..91e13ae5c 100644 --- a/aodh/evaluator/threshold.py +++ b/aodh/evaluator/threshold.py @@ -49,7 +49,7 @@ class ThresholdEvaluator(evaluator.Evaluator): auth_config = conf.service_credentials self._client = ceiloclient.get_client( 2, - os_auth_url=auth_config.os_auth_url, + os_auth_url=auth_config.os_auth_url.replace('/v2.0', '/'), os_region_name=auth_config.os_region_name, os_tenant_name=auth_config.os_tenant_name, os_password=auth_config.os_password, diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 54133b797..2cbf03a37 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -189,7 +189,7 @@ function configure_aodh { iniset $AODH_CONF service_credentials os_password $SERVICE_PASSWORD iniset $AODH_CONF service_credentials os_tenant_name $SERVICE_TENANT_NAME iniset $AODH_CONF service_credentials os_region_name $REGION_NAME - iniset $AODH_CONF service_credentials os_auth_url $KEYSTONE_SERVICE_URI + iniset $AODH_CONF service_credentials os_auth_url $KEYSTONE_SERVICE_URI/v2.0 # TODO(chdent): Until # https://bugs.launchpad.net/keystonemiddleware/+bug/1482078