From 2c7862cef32d7461462ab1b2253a621716114e6e Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Thu, 12 Jan 2017 17:33:21 +0000 Subject: [PATCH] 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 --- devstack/settings | 2 +- releasenotes/notes/bug-1656063-00b08d0cb6e3def8.yaml | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/bug-1656063-00b08d0cb6e3def8.yaml diff --git a/devstack/settings b/devstack/settings index 61dcc07..2c1bae2 100644 --- a/devstack/settings +++ b/devstack/settings @@ -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 diff --git a/releasenotes/notes/bug-1656063-00b08d0cb6e3def8.yaml b/releasenotes/notes/bug-1656063-00b08d0cb6e3def8.yaml new file mode 100644 index 0000000..c098c4a --- /dev/null +++ b/releasenotes/notes/bug-1656063-00b08d0cb6e3def8.yaml @@ -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.