summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad P. Crochet <brad@redhat.com>2018-08-21 10:01:47 -0400
committerRenat Akhmerov <renat.akhmerov@gmail.com>2019-02-19 10:37:23 +0000
commit0085d08baa129c3eae121a31a5c35cf7bd684aad (patch)
tree63019ed2f67e773d60762f31410c4642a00aff00
parentaa30e18c5be122c443c0c2d2ba4f73ff11e9d817 (diff)
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
Notes
Notes (review): Code-Review+1: Tobias Urdin <tobias.urdin@binero.se> Code-Review+1: dharmendra kushwaha <dharmendra.kushwaha@india.nec.com> Code-Review+1: Pierre Gaxatte <pierre.gaxatte@corp.ovh.com> Code-Review+1: C├ędric Jeanneret <cjeanner@redhat.com> Code-Review+2: Renat Akhmerov <renat.akhmerov@gmail.com> Code-Review+1: Akhil jain <akhil.jain@india.nec.com> Code-Review+1: Oleg Ovcharuk <vgvoleg@gmail.com> Code-Review+2: Adriano Petrich <apetrich@redhat.com> Workflow+1: Renat Akhmerov <renat.akhmerov@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 19 Feb 2019 21:09:01 +0000 Reviewed-on: https://review.openstack.org/594187 Project: openstack/mistral Branch: refs/heads/master
-rwxr-xr-xdevstack/plugin.sh2
-rw-r--r--doc/source/configuration/config-guide.rst2
-rw-r--r--doc/source/install/mistralclient_guide.rst2
-rw-r--r--lower-constraints.txt2
-rw-r--r--mistral/context.py2
-rw-r--r--mistral/utils/openstack/keystone.py8
-rw-r--r--requirements.txt2
-rw-r--r--test-requirements.txt2
8 files changed, 11 insertions, 11 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 0d7f641..cdae585 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -78,7 +78,7 @@ function configure_mistral {
78 78
79 # Setup keystone_authtoken section 79 # Setup keystone_authtoken section
80 configure_auth_token_middleware $MISTRAL_CONF_FILE mistral $MISTRAL_AUTH_CACHE_DIR 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 # Setup RabbitMQ credentials 83 # Setup RabbitMQ credentials
84 iniset_rpc_backend mistral $MISTRAL_CONF_FILE 84 iniset_rpc_backend mistral $MISTRAL_CONF_FILE
diff --git a/doc/source/configuration/config-guide.rst b/doc/source/configuration/config-guide.rst
index d9f840b..89be619 100644
--- a/doc/source/configuration/config-guide.rst
+++ b/doc/source/configuration/config-guide.rst
@@ -19,7 +19,7 @@ directory.
19 auth properties:: 19 auth properties::
20 20
21 [keystone_authtoken] 21 [keystone_authtoken]
22 auth_uri = http://<keystone-host>:5000/v3 22 www_authenticate_uri = http://keystone1.example.com:5000/v3
23 identity_uri = http://<keystone-host:5000 23 identity_uri = http://<keystone-host:5000
24 auth_version = v3 24 auth_version = v3
25 admin_user = <user> 25 admin_user = <user>
diff --git a/doc/source/install/mistralclient_guide.rst b/doc/source/install/mistralclient_guide.rst
index b629a88..ead9731 100644
--- a/doc/source/install/mistralclient_guide.rst
+++ b/doc/source/install/mistralclient_guide.rst
@@ -93,7 +93,7 @@ workflow on the `http://keystone2.example.com` cloud.
93The mistral.conf will look like:: 93The mistral.conf will look like::
94 94
95 [keystone_authtoken] 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
99The client side parameters will be:: 99The client side parameters will be::
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 30730cf..3883101 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -43,7 +43,7 @@ jsonpointer==1.13
43jsonschema==2.6.0 43jsonschema==2.6.0
44kazoo==2.2 44kazoo==2.2
45keystoneauth1==3.4.0 45keystoneauth1==3.4.0
46keystonemiddleware==4.17.0 46keystonemiddleware==4.18.0
47kombu==4.0.0 47kombu==4.0.0
48linecache2==1.0.0 48linecache2==1.0.0
49logutils==0.3.5 49logutils==0.3.5
diff --git a/mistral/context.py b/mistral/context.py
index cd28f1f..567a8e5 100644
--- a/mistral/context.py
+++ b/mistral/context.py
@@ -167,7 +167,7 @@ def _extract_mistral_auth_params(headers):
167 ) 167 )
168 else: 168 else:
169 params = { 169 params = {
170 'auth_uri': CONF.keystone_authtoken.auth_uri, 170 'auth_uri': CONF.keystone_authtoken.www_authenticate_uri,
171 'auth_cacert': CONF.keystone_authtoken.cafile, 171 'auth_cacert': CONF.keystone_authtoken.cafile,
172 'insecure': False, 172 'insecure': False,
173 'region_name': headers.get('X-Region-Name'), 173 'region_name': headers.get('X-Region-Name'),
diff --git a/mistral/utils/openstack/keystone.py b/mistral/utils/openstack/keystone.py
index a61a22c..fc25a57 100644
--- a/mistral/utils/openstack/keystone.py
+++ b/mistral/utils/openstack/keystone.py
@@ -32,7 +32,7 @@ CONF = cfg.CONF
32 32
33def client(): 33def client():
34 ctx = context.ctx() 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 cl = ks_client.Client( 37 cl = ks_client.Client(
38 user_id=ctx.user_id, 38 user_id=ctx.user_id,
@@ -76,7 +76,7 @@ def get_session_and_auth(context, **kwargs):
76 76
77 auth = Token(endpoint=endpoint, token=context.auth_token) 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 ks_auth = Token( 80 ks_auth = Token(
81 endpoint=auth_uri, 81 endpoint=auth_uri,
82 token=context.auth_token 82 token=context.auth_token
@@ -94,7 +94,7 @@ def get_session_and_auth(context, **kwargs):
94 94
95def _admin_client(trust_id=None): 95def _admin_client(trust_id=None):
96 if CONF.keystone_authtoken.auth_type is None: 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 project_name = CONF.keystone_authtoken.admin_tenant_name 98 project_name = CONF.keystone_authtoken.admin_tenant_name
99 99
100 # You can't use trust and project together 100 # You can't use trust and project together
@@ -271,7 +271,7 @@ def get_admin_session():
271 """Returns a keystone session from Mistral's service credentials.""" 271 """Returns a keystone session from Mistral's service credentials."""
272 if CONF.keystone_authtoken.auth_type is None: 272 if CONF.keystone_authtoken.auth_type is None:
273 auth = auth_plugins.Password( 273 auth = auth_plugins.Password(
274 CONF.keystone_authtoken.auth_uri, 274 CONF.keystone_authtoken.www_authenticate_uri,
275 username=CONF.keystone_authtoken.admin_user, 275 username=CONF.keystone_authtoken.admin_user,
276 password=CONF.keystone_authtoken.admin_password, 276 password=CONF.keystone_authtoken.admin_password,
277 project_name=CONF.keystone_authtoken.admin_tenant_name, 277 project_name=CONF.keystone_authtoken.admin_tenant_name,
diff --git a/requirements.txt b/requirements.txt
index ee6c20d..f21d275 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ eventlet!=0.20.1,>=0.20.0 # MIT
12gnocchiclient>=3.3.1 # Apache-2.0 12gnocchiclient>=3.3.1 # Apache-2.0
13Jinja2>=2.10 # BSD License (3 clause) 13Jinja2>=2.10 # BSD License (3 clause)
14jsonschema<3.0.0,>=2.6.0 # MIT 14jsonschema<3.0.0,>=2.6.0 # MIT
15keystonemiddleware>=4.17.0 # Apache-2.0 15keystonemiddleware>=4.18.0 # Apache-2.0
16mistral-lib>=0.4.0 # Apache-2.0 16mistral-lib>=0.4.0 # Apache-2.0
17networkx>=1.10 # BSD 17networkx>=1.10 # BSD
18oslo.concurrency>=3.26.0 # Apache-2.0 18oslo.concurrency>=3.26.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index b8f5540..c2ce4d6 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,7 +7,7 @@ coverage!=4.4,>=4.0 # Apache-2.0
7croniter>=0.3.4 # MIT License 7croniter>=0.3.4 # MIT License
8doc8>=0.6.0 # Apache-2.0 8doc8>=0.6.0 # Apache-2.0
9fixtures>=3.0.0 # Apache-2.0/BSD 9fixtures>=3.0.0 # Apache-2.0/BSD
10keystonemiddleware>=4.17.0 # Apache-2.0 10keystonemiddleware>=4.18.0 # Apache-2.0
11mistral-lib>=0.4.0 # Apache-2.0 11mistral-lib>=0.4.0 # Apache-2.0
12mock>=2.0.0 # BSD 12mock>=2.0.0 # BSD
13networkx>=1.10 # BSD 13networkx>=1.10 # BSD