Merge "Remove "test-only" pam config options"

5 files changed, 9 insertions, 25 deletions

diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample
index b9833de62..5f9cbf905 100644
--- a/etc/keystone.conf.sample
+++ b/etc/keystone.conf.sample
@@ -1047,19 +1047,6 @@
 #enabled=false
 
 
-[pam]
-
-#
-# Options defined in keystone
-#
-
-#  (string value)
-#userid=<None>
-
-#  (string value)
-#password=<None>
-
-
 [paste_deploy]
 
 #
diff --git a/keystone/common/config.py b/keystone/common/config.py
index 2c619fce1..3e3b037d5 100644
--- a/keystone/common/config.py
+++ b/keystone/common/config.py
@@ -525,9 +525,6 @@ FILE_OPTIONS = {
         cfg.StrOpt('tls_req_cert', default='demand',
                    help='valid options for tls_req_cert are demand, never, '
                         'and allow')],
-    'pam': [
-        cfg.StrOpt('userid', default=None),
-        cfg.StrOpt('password', default=None)],
     'auth': [
         cfg.ListOpt('methods', default=_DEFAULT_AUTH_METHODS,
                     help='Default auth methods.'),
diff --git a/keystone/tests/backend_pam.conf b/keystone/tests/backend_pam.conf
deleted file mode 100644
index 41f868c74..000000000
--- a/keystone/tests/backend_pam.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[pam]
-userid = fakeuser
-password = fakepass
-
-[identity]
-driver = keystone.identity.backends.pam.PamIdentity
diff --git a/keystone/tests/core.py b/keystone/tests/core.py
index 04ebd11b1..a76231563 100644
--- a/keystone/tests/core.py
+++ b/keystone/tests/core.py
@@ -61,6 +61,7 @@ from keystone import exception
 from keystone import notifications
 from keystone.openstack.common.db.sqlalchemy import migration
 from keystone.openstack.common.db.sqlalchemy import session
+from keystone.openstack.common.fixture import config as config_fixture
 from keystone.openstack.common import log
 from keystone.openstack.common import timeutils
 from keystone import service
@@ -330,6 +331,8 @@ class TestCase(testtools.TestCase):
         self.exit_patch = self.useFixture(mockpatch.PatchObject(sys, 'exit'))
         self.exit_patch.mock.side_effect = UnexpectedExit
 
+        self.config_fixture = self.useFixture(config_fixture.Config(CONF))
+
         self.config([dirs.etc('keystone.conf.sample'),
                      dirs.tests('test_overrides.conf')])
 
diff --git a/keystone/tests/test_backend_pam.py b/keystone/tests/test_backend_pam.py
index ec27f7569..1b8d52393 100644
--- a/keystone/tests/test_backend_pam.py
+++ b/keystone/tests/test_backend_pam.py
@@ -27,12 +27,15 @@ class PamIdentity(tests.TestCase):
     def setUp(self):
         super(PamIdentity, self).setUp()
         self.config([tests.dirs.etc('keystone.conf.sample'),
-                     tests.dirs.tests('test_overrides.conf'),
-                     tests.dirs.tests('backend_pam.conf')])
+                     tests.dirs.tests('test_overrides.conf')])
+        self.config_fixture.config(
+            group='identity',
+            driver='keystone.identity.backends.pam.PamIdentity')
+
         self.identity_api = identity_pam.PamIdentity()
         tenant_id = uuid.uuid4().hex
         self.tenant_in = {'id': tenant_id, 'name': tenant_id}
-        self.user_in = {'id': CONF.pam.userid, 'name': CONF.pam.userid}
+        self.user_in = {'id': 'fakeuser', 'name': 'fakeuser'}
 
     def test_get_project(self):
         tenant_out = self.identity_api.get_project(self.tenant_in['id'])