From 7b8776e4836ecda1fdd4e3a37e2f428de60cd066 Mon Sep 17 00:00:00 2001
From: melissaml <ma.lei@99cloud.net>
Date: Wed, 18 Apr 2018 19:14:50 +0800
Subject: [PATCH] Update auth_uri option to www_authenticate_uri

Option auth_uri from group keystone_authtoken is deprecated[1].
Use option www_authenticate_uri from group keystone_authtoken.

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

Change-Id: Ieff5b69018e3824074b5a528a7b9d2a00dd7fb2e
---
 devstack/plugin.sh                    | 4 ++--
 devstack/upgrade/upgrade.sh           | 4 ++--
 doc/source/install/install-obs.rst    | 2 +-
 doc/source/install/install-rdo.rst    | 2 +-
 doc/source/install/install-ubuntu.rst | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 6fbc55770..4bb64d93d 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -247,8 +247,8 @@ function start_zaqar {
     run_process zaqar-websocket "$ZAQAR_BIN_DIR/zaqar-server --config-file $ZAQAR_CONF"
 
     echo "Waiting for Zaqar to start..."
-    local auth_uri=http://${ZAQAR_SERVICE_HOST}/identity
-    token=$(openstack token issue -c id -f value --os-auth-url ${auth_uri})
+    local www_authenticate_uri=http://${ZAQAR_SERVICE_HOST}/identity
+    token=$(openstack token issue -c id -f value --os-auth-url ${www_authenticate_uri})
     if ! timeout $SERVICE_TIMEOUT sh -c "while ! wget --no-proxy -q --header=\"Client-ID:$(uuidgen)\" --header=\"X-Auth-Token:$token\" -O- $ZAQAR_SERVICE_PROTOCOL://$ZAQAR_SERVICE_HOST:$ZAQAR_SERVICE_PORT/v2/ping; do sleep 1; done"; then
         die $LINENO "Zaqar did not start"
     fi
diff --git a/devstack/upgrade/upgrade.sh b/devstack/upgrade/upgrade.sh
index a9f3aa6ac..9c61e9b30 100755
--- a/devstack/upgrade/upgrade.sh
+++ b/devstack/upgrade/upgrade.sh
@@ -65,8 +65,8 @@ source $ZAQAR_DEVSTACK_DIR/plugin.sh
 set -o xtrace
 
 function wait_for_keystone {
-    local auth_uri=http://${ZAQAR_SERVICE_HOST}/identity
-    if ! wait_for_service $SERVICE_TIMEOUT ${auth_uri}/v$IDENTITY_API_VERSION/; then
+    local www_authenticate_uri=http://${ZAQAR_SERVICE_HOST}/identity
+    if ! wait_for_service $SERVICE_TIMEOUT ${www_authenticate_uri}/v$IDENTITY_API_VERSION/; then
         die $LINENO "keystone did not start"
     fi
 }
diff --git a/doc/source/install/install-obs.rst b/doc/source/install/install-obs.rst
index d1fbbb318..1625eb53d 100644
--- a/doc/source/install/install-obs.rst
+++ b/doc/source/install/install-obs.rst
@@ -393,7 +393,7 @@ Install and configure ``memcached``, ``uWSGI`` and Messaging on the web server
       password = ZAQARIDENTITYPASSWORD
       # Complete public Identity API endpoint (HTTPS protocol is more preferable
       # than HTTP).
-      auth_uri = HTTPS://IDENTITY.EXAMPLE-MESSAGES.NET:5000
+      www_authenticate_uri = HTTPS://IDENTITY.EXAMPLE-MESSAGES.NET:5000
       # Complete admin Identity API endpoint (HTTPS protocol is more preferable
       # than HTTP).
       auth_url = HTTPS://IDENTITY.EXAMPLE-MESSAGES.NET:35357
diff --git a/doc/source/install/install-rdo.rst b/doc/source/install/install-rdo.rst
index 6b0795b62..a6bdb24aa 100644
--- a/doc/source/install/install-rdo.rst
+++ b/doc/source/install/install-rdo.rst
@@ -393,7 +393,7 @@ Install and configure ``memcached``, ``uWSGI`` and Messaging on the web server
       password = ZAQARIDENTITYPASSWORD
       # Complete public Identity API endpoint (HTTPS protocol is more preferable
       # than HTTP).
-      auth_uri = HTTPS://IDENTITY.EXAMPLE-MESSAGES.NET:5000
+      www_authenticate_uri = HTTPS://IDENTITY.EXAMPLE-MESSAGES.NET:5000
       # Complete admin Identity API endpoint (HTTPS protocol is more preferable
       # than HTTP).
       identity_uri = HTTPS://IDENTITY.EXAMPLE-MESSAGES.NET:35357
diff --git a/doc/source/install/install-ubuntu.rst b/doc/source/install/install-ubuntu.rst
index 5637d29c4..40fdb1650 100644
--- a/doc/source/install/install-ubuntu.rst
+++ b/doc/source/install/install-ubuntu.rst
@@ -381,7 +381,7 @@ Install and configure ``memcached``, ``uWSGI`` and Messaging on the web server
       password = ZAQARIDENTITYPASSWORD
       # Complete public Identity API endpoint (HTTPS protocol is more preferable
       # than HTTP).
-      auth_uri = HTTPS://IDENTITY.EXAMPLE-MESSAGES.NET:5000
+      www_authenticate_uri = HTTPS://IDENTITY.EXAMPLE-MESSAGES.NET:5000
       # Complete admin Identity API endpoint (HTTPS protocol is more preferable
       # than HTTP).
       identity_uri = HTTPS://IDENTITY.EXAMPLE-MESSAGES.NET:35357