Browse Source

Stop using deprecated keystone_authtoken/auth_uri

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

keystonemiddleware 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: I99b0ee941d702a28fb4f392d9747d0e2257a42c8
Closes-Bug: #1788174
tags/8.0.0.0b2
Brad P. Crochet 9 months ago
parent
commit
0085d08baa

+ 1
- 1
devstack/plugin.sh View File

@@ -78,7 +78,7 @@ function configure_mistral {
78 78
 
79 79
     # Setup keystone_authtoken section
80 80
     configure_auth_token_middleware $MISTRAL_CONF_FILE mistral $MISTRAL_AUTH_CACHE_DIR
81
-    iniset $MISTRAL_CONF_FILE keystone_authtoken auth_uri $KEYSTONE_AUTH_URI_V3
81
+    iniset $MISTRAL_CONF_FILE keystone_authtoken www_authenticate_uri $KEYSTONE_AUTH_URI_V3
82 82
 
83 83
     # Setup RabbitMQ credentials
84 84
     iniset_rpc_backend mistral $MISTRAL_CONF_FILE

+ 1
- 1
doc/source/configuration/config-guide.rst View File

@@ -19,7 +19,7 @@ directory.
19 19
    auth properties::
20 20
 
21 21
     [keystone_authtoken]
22
-    auth_uri = http://<keystone-host>:5000/v3
22
+    www_authenticate_uri = http://keystone1.example.com:5000/v3
23 23
     identity_uri = http://<keystone-host:5000
24 24
     auth_version = v3
25 25
     admin_user = <user>

+ 1
- 1
doc/source/install/mistralclient_guide.rst View File

@@ -93,7 +93,7 @@ workflow on the `http://keystone2.example.com` cloud.
93 93
 The mistral.conf will look like::
94 94
 
95 95
     [keystone_authtoken]
96
-    auth_uri = http://keystone1.example.com:5000/v3
96
+    www_authenticate_uri = http://keystone1.example.com:5000/v3
97 97
     ...
98 98
 
99 99
 The client side parameters will be::

+ 1
- 1
lower-constraints.txt View File

@@ -43,7 +43,7 @@ jsonpointer==1.13
43 43
 jsonschema==2.6.0
44 44
 kazoo==2.2
45 45
 keystoneauth1==3.4.0
46
-keystonemiddleware==4.17.0
46
+keystonemiddleware==4.18.0
47 47
 kombu==4.0.0
48 48
 linecache2==1.0.0
49 49
 logutils==0.3.5

+ 1
- 1
mistral/context.py View File

@@ -167,7 +167,7 @@ def _extract_mistral_auth_params(headers):
167 167
         )
168 168
     else:
169 169
         params = {
170
-            'auth_uri': CONF.keystone_authtoken.auth_uri,
170
+            'auth_uri': CONF.keystone_authtoken.www_authenticate_uri,
171 171
             'auth_cacert': CONF.keystone_authtoken.cafile,
172 172
             'insecure': False,
173 173
             'region_name': headers.get('X-Region-Name'),

+ 4
- 4
mistral/utils/openstack/keystone.py View File

@@ -32,7 +32,7 @@ CONF = cfg.CONF
32 32
 
33 33
 def client():
34 34
     ctx = context.ctx()
35
-    auth_url = ctx.auth_uri or CONF.keystone_authtoken.auth_uri
35
+    auth_url = ctx.auth_uri or CONF.keystone_authtoken.www_authenticate_uri
36 36
 
37 37
     cl = ks_client.Client(
38 38
         user_id=ctx.user_id,
@@ -76,7 +76,7 @@ def get_session_and_auth(context, **kwargs):
76 76
 
77 77
     auth = Token(endpoint=endpoint, token=context.auth_token)
78 78
 
79
-    auth_uri = context.auth_uri or CONF.keystone_authtoken.auth_uri
79
+    auth_uri = context.auth_uri or CONF.keystone_authtoken.www_authenticate_uri
80 80
     ks_auth = Token(
81 81
         endpoint=auth_uri,
82 82
         token=context.auth_token
@@ -94,7 +94,7 @@ def get_session_and_auth(context, **kwargs):
94 94
 
95 95
 def _admin_client(trust_id=None):
96 96
     if CONF.keystone_authtoken.auth_type is None:
97
-        auth_url = CONF.keystone_authtoken.auth_uri
97
+        auth_url = CONF.keystone_authtoken.www_authenticate_uri
98 98
         project_name = CONF.keystone_authtoken.admin_tenant_name
99 99
 
100 100
         # You can't use trust and project together
@@ -271,7 +271,7 @@ def get_admin_session():
271 271
     """Returns a keystone session from Mistral's service credentials."""
272 272
     if CONF.keystone_authtoken.auth_type is None:
273 273
         auth = auth_plugins.Password(
274
-            CONF.keystone_authtoken.auth_uri,
274
+            CONF.keystone_authtoken.www_authenticate_uri,
275 275
             username=CONF.keystone_authtoken.admin_user,
276 276
             password=CONF.keystone_authtoken.admin_password,
277 277
             project_name=CONF.keystone_authtoken.admin_tenant_name,

+ 1
- 1
requirements.txt View File

@@ -12,7 +12,7 @@ eventlet!=0.20.1,>=0.20.0 # MIT
12 12
 gnocchiclient>=3.3.1 # Apache-2.0
13 13
 Jinja2>=2.10 # BSD License (3 clause)
14 14
 jsonschema<3.0.0,>=2.6.0 # MIT
15
-keystonemiddleware>=4.17.0 # Apache-2.0
15
+keystonemiddleware>=4.18.0 # Apache-2.0
16 16
 mistral-lib>=0.4.0 # Apache-2.0
17 17
 networkx>=1.10 # BSD
18 18
 oslo.concurrency>=3.26.0 # Apache-2.0

+ 1
- 1
test-requirements.txt View File

@@ -7,7 +7,7 @@ coverage!=4.4,>=4.0 # Apache-2.0
7 7
 croniter>=0.3.4 # MIT License
8 8
 doc8>=0.6.0 # Apache-2.0
9 9
 fixtures>=3.0.0 # Apache-2.0/BSD
10
-keystonemiddleware>=4.17.0 # Apache-2.0
10
+keystonemiddleware>=4.18.0 # Apache-2.0
11 11
 mistral-lib>=0.4.0 # Apache-2.0
12 12
 mock>=2.0.0 # BSD
13 13
 networkx>=1.10 # BSD

Loading…
Cancel
Save