x/iotronic
Code Issues Proposed changes

Merge "Update "auth_url""

Browse Source
This commit is contained in:
Zuul 2018-06-28 14:25:52 +00:00 committed by Gerrit Code Review
commit 0831c76d69
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/iotronic/iotronic.conf
View File

@ -28,8 +28,8 @@ wamp_realm = s4t
connection = mysql+pymsql://<user>:<password>@<host>/iotronic connection = mysql+pymsql://<user>:<password>@<host>/iotronic
[keystone_authtoken] [keystone_authtoken]
auth_uri = http://<keystone_host>:5000 www_authenticate_uri = http://<keystone_host>:5000
auth_url = http://<keystone_host>:35357 auth_url = http://<keystone_host>:5000
auth_plugin = password auth_plugin = password
project_domain_id = default project_domain_id = default
user_domain_id = default user_domain_id = default

2
iotronic/common/keystone.py
View File

@ -46,7 +46,7 @@ def _is_apiv3(auth_url, auth_version):
def _get_ksclient(token=None): def _get_ksclient(token=None):
auth_url = CONF.keystone_authtoken.auth_uri auth_url = CONF.keystone_authtoken.www_authenticate_uri
if not auth_url: if not auth_url:
raise exception.KeystoneFailure(_('Keystone API endpoint is missing')) raise exception.KeystoneFailure(_('Keystone API endpoint is missing'))