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
This commit is contained in:
parent
3cd06698bb
commit
c10b8983bc
@ -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,
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user