Merge "Use generic keystone uri in devstack config"

This commit is contained in:
Jenkins 2015-08-16 13:25:04 +00:00 committed by Gerrit Code Review
commit 47ded6a0e0

View File

@ -189,7 +189,7 @@ function configure_aodh {
iniset $AODH_CONF service_credentials os_password $SERVICE_PASSWORD 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_tenant_name $SERVICE_TENANT_NAME
iniset $AODH_CONF service_credentials os_region_name $REGION_NAME iniset $AODH_CONF service_credentials os_region_name $REGION_NAME
iniset $AODH_CONF service_credentials os_auth_url $KEYSTONE_SERVICE_URI/v2.0 iniset $AODH_CONF service_credentials os_auth_url $KEYSTONE_SERVICE_URI
# TODO(chdent): Until # TODO(chdent): Until
# https://bugs.launchpad.net/keystonemiddleware/+bug/1482078 # https://bugs.launchpad.net/keystonemiddleware/+bug/1482078