openstack
/
karbor
Code Issues Proposed changes

Stop using deprecated keystone_authtoken/auth_uri 

keystone_authtoken/auth_uri is deprecated [1]. Use www_authenticate_uri
instead.

keystonemiddleware is in requirements and lower constraints
should be increased because www_authenticate_uri was introduced
in keystonemiddleware 4.18.0.

[1] https://review.openstack.org/#/c/508522/

Change-Id: Iad00242c629d1a321c5067e705108396931402a2
This commit is contained in:
Vlad Gusev 2019-01-25 11:26:54 +03:00 committed by Jiao Pengju
parent 798750c2a1
commit a5e27bbaa9
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/install/common_configure.rst
View File

@ -32,7 +32,7 @@
[keystone_authtoken] [keystone_authtoken]
... ...
auth_uri = http://controller/identity www_authenticate_uri = http://keystone1.example.com/identity
auth_url = http://controller/identity_admin auth_url = http://controller/identity_admin
auth_type = password auth_type = password
project_domain_name = default project_domain_name = default

2
karbor/utils.py
View File

@ -137,7 +137,7 @@ def get_auth_uri(v3=True):
else: else:
# Import auth_token to have keystone_authtoken settings setup. # Import auth_token to have keystone_authtoken settings setup.
importutils.import_module('keystonemiddleware.auth_token') importutils.import_module('keystonemiddleware.auth_token')
auth_uri = cfg.CONF.keystone_authtoken.auth_uri auth_uri = cfg.CONF.keystone_authtoken.www_authenticate_uri
return auth_uri.replace('v2.0', 'v3') if auth_uri and v3 else auth_uri return auth_uri.replace('v2.0', 'v3') if auth_uri and v3 else auth_uri

2
lower-constraints.txt
View File

@ -44,7 +44,7 @@ jsonpatch==1.21
jsonpointer==2.0 jsonpointer==2.0
jsonschema==2.6.0 jsonschema==2.6.0
keystoneauth1==3.4.0 keystoneauth1==3.4.0
keystonemiddleware==4.17.0 keystonemiddleware==4.18.0
kombu==4.1.0 kombu==4.1.0
kubernetes==5.0.0 kubernetes==5.0.0
linecache2==1.0.0 linecache2==1.0.0

2
requirements.txt
View File

@ -11,7 +11,7 @@ greenlet>=0.4.10 # MIT
icalendar>=3.10 # BSD icalendar>=3.10 # BSD
jsonschema<3.0.0,>=2.6.0 # MIT jsonschema<3.0.0,>=2.6.0 # MIT
keystoneauth1>=3.4.0 # Apache-2.0 keystoneauth1>=3.4.0 # Apache-2.0
keystonemiddleware>=4.17.0 # Apache-2.0 keystonemiddleware>=4.18.0 # Apache-2.0
kubernetes>=5.0.0 # Apache-2.0 kubernetes>=5.0.0 # Apache-2.0
python-manilaclient>=1.16.0 # Apache-2.0 python-manilaclient>=1.16.0 # Apache-2.0
oslo.config>=5.2.0 # Apache-2.0 oslo.config>=5.2.0 # Apache-2.0