Revert "Remove version from os_auth_url in service_credentials"

This reverts commit 33f133ab0cd37da5366769603ece67877505e7c9.

Apparently the way keystone info is used in aodh is different from how
ceilometer uses it. With the change to be reverted in place, none of the
agents can talk to services.

Change-Id: I462f7c4977f14e45069e2c826abd7944252bd9d9
This commit is contained in:
Chris Dent 2015-08-14 10:15:58 +00:00
parent 33f133ab0c
commit 055ebb9d21

View File

@ -269,7 +269,7 @@ function configure_ceilometer {
iniset $CEILOMETER_CONF service_credentials os_password $SERVICE_PASSWORD
iniset $CEILOMETER_CONF service_credentials os_tenant_name $SERVICE_TENANT_NAME
iniset $CEILOMETER_CONF service_credentials os_region_name $REGION_NAME
iniset $CEILOMETER_CONF service_credentials os_auth_url $KEYSTONE_SERVICE_URI
iniset $CEILOMETER_CONF service_credentials os_auth_url $KEYSTONE_SERVICE_URI/v2.0
configure_auth_token_middleware $CEILOMETER_CONF ceilometer $CEILOMETER_AUTH_CACHE_DIR