Merge "Stop using deprecated keystone_authtoken/auth_uri"

devstack/plugin.sh

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

doc/source/configuration/config-guide.rst

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

doc/source/install/mistralclient_guide.rst

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

lower-constraints.txt

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

mistral/context.py

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

mistral/utils/openstack/keystone.py

@@ -32,7 +32,7 @@ CONF = cfg.CONF
 
 def client():
     ctx = context.ctx()
-    auth_url = ctx.auth_uri or CONF.keystone_authtoken.auth_uri
+    auth_url = ctx.auth_uri or CONF.keystone_authtoken.www_authenticate_uri
 
     cl = ks_client.Client(
         user_id=ctx.user_id,
@@ -76,7 +76,7 @@ def get_session_and_auth(context, **kwargs):
 
     auth = Token(endpoint=endpoint, token=context.auth_token)
 
-    auth_uri = context.auth_uri or CONF.keystone_authtoken.auth_uri
+    auth_uri = context.auth_uri or CONF.keystone_authtoken.www_authenticate_uri
     ks_auth = Token(
         endpoint=auth_uri,
         token=context.auth_token
@@ -94,7 +94,7 @@ def get_session_and_auth(context, **kwargs):
 
 def _admin_client(trust_id=None):
     if CONF.keystone_authtoken.auth_type is None:
-        auth_url = CONF.keystone_authtoken.auth_uri
+        auth_url = CONF.keystone_authtoken.www_authenticate_uri
         project_name = CONF.keystone_authtoken.admin_tenant_name
 
         # You can't use trust and project together
@@ -271,7 +271,7 @@ def get_admin_session():
     """Returns a keystone session from Mistral's service credentials."""
     if CONF.keystone_authtoken.auth_type is None:
         auth = auth_plugins.Password(
-            CONF.keystone_authtoken.auth_uri,
+            CONF.keystone_authtoken.www_authenticate_uri,
             username=CONF.keystone_authtoken.admin_user,
             password=CONF.keystone_authtoken.admin_password,
             project_name=CONF.keystone_authtoken.admin_tenant_name,

requirements.txt

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

test-requirements.txt

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