diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-05-09 00:17:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-05-09 00:17:38 +0000 |
| commit | fa5181d2ecfbaeb8ff7e709429a7a64fe312d2c4 (patch) | |
| tree | 843a11bee8c40c4bff2c86f9f2650715b4a74c15 | |
| parent | 96a816f50d2ab9fdf88af4489d51f24188a555a4 (diff) | |
| parent | 9bc7267bd7ad1edca4135051767f2e99d9b66d38 (diff) | |
| download | keystone-fa5181d2ecfbaeb8ff7e709429a7a64fe312d2c4.tar.gz keystone-fa5181d2ecfbaeb8ff7e709429a7a64fe312d2c4.tar.xz keystone-fa5181d2ecfbaeb8ff7e709429a7a64fe312d2c4.zip | |
Merge "Remove unused CONF.pam.url"
| -rw-r--r-- | keystone/common/config.py | 1 | ||||
| -rw-r--r-- | tests/backend_pam.conf | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/keystone/common/config.py b/keystone/common/config.py index e2ff7e14..5483a6a0 100644 --- a/keystone/common/config.py +++ b/keystone/common/config.py @@ -389,7 +389,6 @@ def configure(): register_str('tls_req_cert', group='ldap', default='demand') # pam - register_str('url', group='pam', default=None) register_str('userid', group='pam', default=None) register_str('password', group='pam', default=None) diff --git a/tests/backend_pam.conf b/tests/backend_pam.conf index b3f922e6..41f868c7 100644 --- a/tests/backend_pam.conf +++ b/tests/backend_pam.conf @@ -1,5 +1,4 @@ [pam] -url = fake://memory userid = fakeuser password = fakepass |