summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcaoyuan <cao.yuan@99cloud.net>2018-04-11 22:28:23 +0800
committercaoyuan <cao.yuan@99cloud.net>2018-04-11 22:28:23 +0800
commit38a5679dac61b7b5ca66a44f2f43407fa5d51455 (patch)
tree16627970d9d1b08cdd5d02415978780448a13ab0
parente96c0093cd7419252242a4f2b1435436f65697f7 (diff)
downloadtrove-38a5679dac61b7b5ca66a44f2f43407fa5d51455.tar.gz
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: I46bb0acaf1dec9bb4b91d4a2180b3e7ed66741c2
-rw-r--r--doc/source/install/common_configure.txt2
-rw-r--r--etc/trove/api-paste.ini.test2
-rw-r--r--etc/trove/trove.conf.test2
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/source/install/common_configure.txt b/doc/source/install/common_configure.txt
index 0e41a71f..77aa9234 100644
--- a/doc/source/install/common_configure.txt
+++ b/doc/source/install/common_configure.txt
@@ -52,7 +52,7 @@
...
[keystone_authtoken]
...
- auth_uri = http://controller/identity
+ www_authenticate_uri = http://controller/identity
auth_url = http://controller/identity_admin
auth_type = password
project_domain_name = default
diff --git a/etc/trove/api-paste.ini.test b/etc/trove/api-paste.ini.test
index de24321a..34db9683 100644
--- a/etc/trove/api-paste.ini.test
+++ b/etc/trove/api-paste.ini.test
@@ -21,7 +21,7 @@ service_port = 5000
auth_host = 127.0.0.1
auth_port = 35357
auth_protocol = http
-auth_uri = http://127.0.0.1/identity/
+www_authenticate_uri = http://127.0.0.1/identity/
signing_dir = /tmp/keystone-signing-trove
[filter:authorization]
diff --git a/etc/trove/trove.conf.test b/etc/trove/trove.conf.test
index 8f675d81..1694eb97 100644
--- a/etc/trove/trove.conf.test
+++ b/etc/trove/trove.conf.test
@@ -171,7 +171,7 @@ service_port = 5000
auth_host = 127.0.0.1
auth_port = 35357
auth_protocol = http
-auth_uri = http://127.0.0.1/identity/
+www_authenticate_uri = http://127.0.0.1/identity/
[filter:authorization]
paste.filter_factory = trove.common.auth:AuthorizationMiddleware.factory