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: Ie0d7c4268a49d3d3c6928b10987dd5eeede683d6
This commit is contained in:
melissaml 2018-04-18 19:33:24 +08:00
parent 6005a4ba5b
commit 03db5d8d31
2 changed files with 4 additions and 3 deletions

View File

@ -129,7 +129,7 @@ Here is an example *inspector.conf* (adapted from a gate run)::
auth_type = password
[keystone_authtoken]
auth_uri = http://127.0.0.1/identity
www_authenticate_uri = http://127.0.0.1/identity
project_name = service
password = <PASSWORD>
username = ironic-inspector

View File

@ -35,7 +35,7 @@ class TestCheckAuth(base.BaseTest):
admin_user='admin',
admin_tenant_name='admin',
admin_password='password',
auth_uri='http://127.0.0.1:5000',
www_authenticate_uri='http://127.0.0.1:5000',
identity_uri='http://127.0.0.1:35357')
app = mock.Mock(wsgi_app=mock.sentinel.app)
@ -50,7 +50,8 @@ class TestCheckAuth(base.BaseTest):
self.assertEqual('admin', args1['admin_tenant_name'])
self.assertEqual('password', args1['admin_password'])
self.assertTrue(args1['delay_auth_decision'])
self.assertEqual('http://127.0.0.1:5000', args1['auth_uri'])
self.assertEqual('http://127.0.0.1:5000',
args1['www_authenticate_uri'])
self.assertEqual('http://127.0.0.1:35357', args1['identity_uri'])
def test_admin(self):