Merge "Update auth_uri option to www_authenticate_uri"
This commit is contained in:
commit
03cbee9c79
@ -129,7 +129,7 @@ Here is an example *inspector.conf* (adapted from a gate run)::
|
|||||||
auth_type = password
|
auth_type = password
|
||||||
|
|
||||||
[keystone_authtoken]
|
[keystone_authtoken]
|
||||||
auth_uri = http://127.0.0.1/identity
|
www_authenticate_uri = http://127.0.0.1/identity
|
||||||
project_name = service
|
project_name = service
|
||||||
password = <PASSWORD>
|
password = <PASSWORD>
|
||||||
username = ironic-inspector
|
username = ironic-inspector
|
||||||
|
@ -35,7 +35,7 @@ class TestCheckAuth(base.BaseTest):
|
|||||||
admin_user='admin',
|
admin_user='admin',
|
||||||
admin_tenant_name='admin',
|
admin_tenant_name='admin',
|
||||||
admin_password='password',
|
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')
|
identity_uri='http://127.0.0.1:35357')
|
||||||
|
|
||||||
app = mock.Mock(wsgi_app=mock.sentinel.app)
|
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('admin', args1['admin_tenant_name'])
|
||||||
self.assertEqual('password', args1['admin_password'])
|
self.assertEqual('password', args1['admin_password'])
|
||||||
self.assertTrue(args1['delay_auth_decision'])
|
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'])
|
self.assertEqual('http://127.0.0.1:35357', args1['identity_uri'])
|
||||||
|
|
||||||
def test_admin(self):
|
def test_admin(self):
|
||||||
|
Loading…
Reference in New Issue
Block a user