diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-04-25 20:30:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-04-25 20:30:27 +0000 |
| commit | d9dd876dbb4e8f653f97a6475e568262a285ebd8 (patch) | |
| tree | 64f86ce054d9f9e835689364251a64285caaf7c8 | |
| parent | 7617fef43f01964c3c56e000fb3c965101e22589 (diff) | |
| parent | d43e2a51a1ed7adbed3c5ddf001d46bc4a824ae8 (diff) | |
| download | keystone-d9dd876dbb4e8f653f97a6475e568262a285ebd8.tar.gz keystone-d9dd876dbb4e8f653f97a6475e568262a285ebd8.tar.xz keystone-d9dd876dbb4e8f653f97a6475e568262a285ebd8.zip | |
Merge "Mark LDAP password and admin_token secret"
| -rw-r--r-- | keystone/common/config.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keystone/common/config.py b/keystone/common/config.py index d7b6ff73..84ea83f4 100644 --- a/keystone/common/config.py +++ b/keystone/common/config.py @@ -188,7 +188,7 @@ def configure(): register_cli_str('pydev-debug-host', default=None) register_cli_int('pydev-debug-port', default=None) - register_str('admin_token', default='ADMIN') + register_str('admin_token', secret=True, default='ADMIN') register_str('bind_host', default='0.0.0.0') register_int('compute_port', default=8774) register_int('admin_port', default=35357) @@ -286,7 +286,7 @@ def configure(): # ldap register_str('url', group='ldap', default='ldap://localhost') register_str('user', group='ldap', default=None) - register_str('password', group='ldap', default=None) + register_str('password', group='ldap', secret=True, default=None) register_str('suffix', group='ldap', default='cn=example,cn=com') register_bool('use_dumb_member', group='ldap', default=False) register_str('dumb_member', group='ldap', default='cn=dumb,dc=nonexistent') |