Remove deprecated [keystone] config section

this section contains only deprecated 'region_name' option,
and thus can be removed altogether.

Change-Id: Ib9308589fbbb06637146d152681700463c3e6333

5 files changed, 2 insertions, 12 deletions

diff --git a/ironic/tests/unit/common/test_cinder.py b/ironic/tests/unit/common/test_cinder.py
index b5c389b16..0008275e1 100644
--- a/ironic/tests/unit/common/test_cinder.py
+++ b/ironic/tests/unit/common/test_cinder.py
@@ -100,8 +100,6 @@ class TestCinderClient(base.TestCase):
     def test_get_client_deprecated_opts(self, mock_client_init, mock_session,
                                         mock_auth, mock_sauth, mock_adapter):
 
-        self.config(region_name='test-region',
-                    group='keystone')
         self.config(url='http://test-url', group='cinder')
         mock_adapter.return_value = mock_adapter_obj = mock.Mock()
         mock_adapter_obj.get_endpoint.return_value = 'http://test-url'
@@ -111,7 +109,7 @@ class TestCinderClient(base.TestCase):
         mock_session.assert_called_once_with('cinder')
         mock_adapter.assert_called_once_with(
             'cinder', session=mock.sentinel.session, auth=mock.sentinel.auth,
-            endpoint_override='http://test-url', region_name='test-region')
+            endpoint_override='http://test-url')
         self.assertFalse(mock_sauth.called)
 
 
diff --git a/ironic/tests/unit/common/test_glance_service.py b/ironic/tests/unit/common/test_glance_service.py
index 72937b365..0e8344b06 100644
--- a/ironic/tests/unit/common/test_glance_service.py
+++ b/ironic/tests/unit/common/test_glance_service.py
@@ -449,7 +449,6 @@ class CheckImageServiceTestCase(base.TestCase):
                     glance_cafile='cafile',
                     region_name=None,
                     group='glance')
-        self.config(region_name='OtherRegion', group='keystone')
 
         wrapped_func = base_image_service.check_image_service(func)
         self.assertEqual(((), params), wrapped_func(self.service, **params))
@@ -460,7 +459,7 @@ class CheckImageServiceTestCase(base.TestCase):
                                           cacert='cafile')
         mock_adapter.assert_called_once_with(
             'glance', session=mock.sentinel.session,
-            auth=mock.sentinel.auth, region_name='OtherRegion')
+            auth=mock.sentinel.auth)
         self.assertEqual(0, mock_sauth.call_count)
         mock_auth.assert_called_once_with('glance')
 
diff --git a/ironic/tests/unit/common/test_keystone.py b/ironic/tests/unit/common/test_keystone.py
index c9c54cff0..596b6a7fe 100644
--- a/ironic/tests/unit/common/test_keystone.py
+++ b/ironic/tests/unit/common/test_keystone.py
@@ -28,8 +28,6 @@ class KeystoneTestCase(base.TestCase):
 
     def setUp(self):
         super(KeystoneTestCase, self).setUp()
-        self.config(region_name='fake_region',
-                    group='keystone')
         self.test_group = 'test_group'
         self.cfg_fixture.conf.register_group(cfg.OptGroup(self.test_group))
         ironic_auth.register_auth_opts(self.cfg_fixture.conf, self.test_group,
diff --git a/ironic/tests/unit/common/test_neutron.py b/ironic/tests/unit/common/test_neutron.py
index e8e52e8e1..8ff1ad936 100644
--- a/ironic/tests/unit/common/test_neutron.py
+++ b/ironic/tests/unit/common/test_neutron.py
@@ -125,8 +125,6 @@ class TestNeutronClient(base.TestCase):
                                                      mock_session,
                                                      mock_adapter, mock_auth,
                                                      mock_sauth):
-        self.config(region_name='fake_region',
-                    group='keystone')
         self.config(url='neutron_url',
                     url_timeout=10,
                     timeout=None,
@@ -139,7 +137,6 @@ class TestNeutronClient(base.TestCase):
         mock_adapter.assert_called_once_with('neutron',
                                              session=mock.sentinel.session,
                                              auth=mock.sentinel.auth,
-                                             region_name='fake_region',
                                              endpoint_override='neutron_url')
 
     def test_get_neutron_client_noauth(self, mock_client_init, mock_session,
diff --git a/ironic/tests/unit/conf/test_auth.py b/ironic/tests/unit/conf/test_auth.py
index 3624472ff..5508a77e1 100644
--- a/ironic/tests/unit/conf/test_auth.py
+++ b/ironic/tests/unit/conf/test_auth.py
@@ -23,8 +23,6 @@ class AuthConfTestCase(base.TestCase):
 
     def setUp(self):
         super(AuthConfTestCase, self).setUp()
-        self.config(region_name='fake_region',
-                    group='keystone')
         self.test_group = 'test_group'
         self.cfg_fixture.conf.register_group(cfg.OptGroup(self.test_group))
         ironic_auth.register_auth_opts(self.cfg_fixture.conf, self.test_group)