From 1b99782821cc95fa0d3bec6a9a4ec1cff6b2bed2 Mon Sep 17 00:00:00 2001 From: caoyuan Date: Sun, 8 Apr 2018 15:12:54 +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: I2a9853b52f23fc4b6a24a0548b9749e976467758 --- contrib/block-box/etc/cinder.conf.keystone | 2 +- doc/source/install/cinder-controller-install-ubuntu.rst | 2 +- doc/source/install/cinder-storage-install-rdo.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/block-box/etc/cinder.conf.keystone b/contrib/block-box/etc/cinder.conf.keystone index 23bf7a8c50e..d65d136b1db 100644 --- a/contrib/block-box/etc/cinder.conf.keystone +++ b/contrib/block-box/etc/cinder.conf.keystone @@ -16,7 +16,7 @@ enabled_backends = solidfire connection = mysql+pymysql://cinder:password@mariadb/cinder?charset=utf8 [keystone_authtoken] -auth_uri = http://keystone:5000 +www_authenticate_uri = http://keystone:5000 auth_url = http://keystone:35357 memcached_servers = keystone:11211 auth_type = password diff --git a/doc/source/install/cinder-controller-install-ubuntu.rst b/doc/source/install/cinder-controller-install-ubuntu.rst index be34d71a0e8..8ebdebf0e24 100644 --- a/doc/source/install/cinder-controller-install-ubuntu.rst +++ b/doc/source/install/cinder-controller-install-ubuntu.rst @@ -277,7 +277,7 @@ Install and configure components [keystone_authtoken] # ... - auth_uri = http://controller:5000 + www_authenticate_uri = http://controller:5000 auth_url = http://controller:35357 memcached_servers = controller:11211 auth_type = password diff --git a/doc/source/install/cinder-storage-install-rdo.rst b/doc/source/install/cinder-storage-install-rdo.rst index d4ba35e0a05..3b57f41dadd 100644 --- a/doc/source/install/cinder-storage-install-rdo.rst +++ b/doc/source/install/cinder-storage-install-rdo.rst @@ -167,7 +167,7 @@ Install and configure components [keystone_authtoken] # ... - auth_uri = http://controller:5000 + www_authenticate_uri = http://controller:5000 auth_url = http://controller:35357 memcached_servers = controller:11211 auth_type = password