Merge "Mark LDAP password and admin_token secret"

This commit is contained in:
Jenkins 2013-04-25 20:30:27 +00:00 committed by Gerrit Code Review
commit d9dd876dbb

View File

@ -188,7 +188,7 @@ def configure():
register_cli_str('pydev-debug-host', default=None) register_cli_str('pydev-debug-host', default=None)
register_cli_int('pydev-debug-port', 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_str('bind_host', default='0.0.0.0')
register_int('compute_port', default=8774) register_int('compute_port', default=8774)
register_int('admin_port', default=35357) register_int('admin_port', default=35357)
@ -286,7 +286,7 @@ def configure():
# ldap # ldap
register_str('url', group='ldap', default='ldap://localhost') register_str('url', group='ldap', default='ldap://localhost')
register_str('user', group='ldap', default=None) 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_str('suffix', group='ldap', default='cn=example,cn=com')
register_bool('use_dumb_member', group='ldap', default=False) register_bool('use_dumb_member', group='ldap', default=False)
register_str('dumb_member', group='ldap', default='cn=dumb,dc=nonexistent') register_str('dumb_member', group='ldap', default='cn=dumb,dc=nonexistent')