From 03db5d8d31e9db76c84c8a979e85b91717e71d39 Mon Sep 17 00:00:00 2001 From: melissaml Date: Wed, 18 Apr 2018 19:33:24 +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: Ie0d7c4268a49d3d3c6928b10987dd5eeede683d6 --- doc/source/install/index.rst | 2 +- ironic_inspector/test/unit/test_utils.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/source/install/index.rst b/doc/source/install/index.rst index 052ae692b..68be4d649 100644 --- a/doc/source/install/index.rst +++ b/doc/source/install/index.rst @@ -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 = username = ironic-inspector diff --git a/ironic_inspector/test/unit/test_utils.py b/ironic_inspector/test/unit/test_utils.py index 872be7fef..12627734f 100644 --- a/ironic_inspector/test/unit/test_utils.py +++ b/ironic_inspector/test/unit/test_utils.py @@ -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):