From a5e27bbaa958df65080cb9d8d1a55831b9aa044b Mon Sep 17 00:00:00 2001
From: Vlad Gusev <vlad.esten@gmail.com>
Date: Fri, 25 Jan 2019 11:26:54 +0300
Subject: [PATCH] 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
---
 doc/source/install/common_configure.rst | 2 +-
 karbor/utils.py                         | 2 +-
 lower-constraints.txt                   | 2 +-
 requirements.txt                        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/source/install/common_configure.rst b/doc/source/install/common_configure.rst
index bea0686e..219ebfe1 100644
--- a/doc/source/install/common_configure.rst
+++ b/doc/source/install/common_configure.rst
@@ -32,7 +32,7 @@
 
         [keystone_authtoken]
         ...
-        auth_uri = http://controller/identity
+        www_authenticate_uri = http://keystone1.example.com/identity
         auth_url = http://controller/identity_admin
         auth_type = password
         project_domain_name = default
diff --git a/karbor/utils.py b/karbor/utils.py
index 6dc54a9f..f5f4f043 100644
--- a/karbor/utils.py
+++ b/karbor/utils.py
@@ -137,7 +137,7 @@ def get_auth_uri(v3=True):
     else:
         # Import auth_token to have keystone_authtoken settings setup.
         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
 
 
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 9e7e88d8..95b4b722 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -44,7 +44,7 @@ jsonpatch==1.21
 jsonpointer==2.0
 jsonschema==2.6.0
 keystoneauth1==3.4.0
-keystonemiddleware==4.17.0
+keystonemiddleware==4.18.0
 kombu==4.1.0
 kubernetes==5.0.0
 linecache2==1.0.0
diff --git a/requirements.txt b/requirements.txt
index e803e2c3..aa5b296d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ greenlet>=0.4.10 # MIT
 icalendar>=3.10 # BSD
 jsonschema<3.0.0,>=2.6.0 # MIT
 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
 python-manilaclient>=1.16.0 # Apache-2.0
 oslo.config>=5.2.0 # Apache-2.0