Use KEYSTONE_SERVICE_URI instead of KEYSTONE_AUTH_URI

- KEYSTONE_AUTH_URI is the admin url
- Use KEYSTONE_SERVICE_URI to access keystone as a service user.

Closes-Bug: #1656063

Change-Id: I957e166931b3dea050d0cee3365250a92ae3a57f
This commit is contained in:
Emma Foley 2017-01-12 17:33:21 +00:00
parent a5df9666fb
commit 2c7862cef3
2 changed files with 10 additions and 1 deletions

View File

@ -15,7 +15,7 @@ CEILOMETER_URL_TYPE=${CEILOMETER_URL_TYPE:-internalURL}
CEILOMETER_TIMEOUT=${CEILOMETER_TIMEOUT:-1000}
# Auth info
OS_AUTH_URL="$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION"
OS_AUTH_URL="$KEYSTONE_SERVICE_URI/v$IDENTITY_API_VERSION"
OS_IDENTITY_API_VERSION=${IDENTITY_API_VERSION:-3}
# Fall back to default conf dir if option is unset

View File

@ -0,0 +1,9 @@
---
fixes:
- |
Fixes 'bug 1656063 https://bugs.launchpad.net/collectd-ceilometer-plugin/+bug/1656063'.
OS_AUTH_URL now uses KEYSTONE_AUTH_URI instead of KEYSTONE_SERVICE_URI.
Previously, the URL needed to be changed after deployment because the admin
url was being used for Keystone, instead of the public url used for
obtainining auth tokens. There's no longer a need to adjust the
configuration file after deployment.