openstack
/
keystone
Code Issues Proposed changes

Merge "Fix the typo and reformat the comments for the added option"

This commit is contained in:
Jenkins 2014-06-19 05:06:14 +00:00 committed by Gerrit Code Review
parent 74b5851d00 b3f4e299e8
commit 684701539b
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
etc/keystone.conf.sample
View File

@ -118,12 +118,11 @@
#domain_id_immutable=true
# If set to true, strict password length checking is performed
# for password manipulation.
# If a password exceeds the maximum length, the operation will
# fail with 403 Forbidden Error.
# If set to false, passwords are automatically truncated to
# the maximum length.
# strict_password_check=false
# for password manipulation. If a password exceeds the maximum
# length, the operation will fail with an HTTP 403 Forbidden
# error. If set to false, passwords are automatically
# truncated to the maximum length. (boolean value)
#strict_password_check=false
#
@ -145,7 +144,7 @@
#allowed_rpc_exception_modules=oslo.messaging.exceptions,nova.exception,cinder.exception,exceptions
# Qpid broker hostname. (string value)
#qpid_hostname=keystone
#qpid_hostname=localhost
# Qpid broker port. (integer value)
#qpid_port=5672
@ -202,7 +201,7 @@
# The RabbitMQ broker address where a single node is used.
# (string value)
#rabbit_host=keystone
#rabbit_host=localhost
# The RabbitMQ broker port where a single node is used.
# (integer value)
@ -823,7 +822,7 @@
#
# URL for connecting to the LDAP server. (string value)
#url=ldap://keystone
#url=ldap://localhost
# User BindDN to query the LDAP server. (string value)
#user=<None>
@ -1275,7 +1274,7 @@
# SSL certificate subject (auto generated certificate).
# (string value)
#cert_subject=/C=US/ST=Unset/L=Unset/O=Unset/CN=keystone
#cert_subject=/C=US/ST=Unset/L=Unset/O=Unset/CN=localhost
[stats]

10
keystone/common/config.py
View File

@ -127,11 +127,11 @@ FILE_OPTIONS = {
'(see policy.v3cloudsample as an example).'),
cfg.BoolOpt('strict_password_check', default=False,
help='If set to true, strict password length checking is '
'performed for password manipulation.'
'If a password exceeds the maximum length, '
'the operation will fail with 403 Forbidden Error.'
'If set to false, passwords are automatically '
'truncated to the maximum length.')],
'performed for password manipulation. If a password '
'exceeds the maximum length, the operation will fail '
'with an HTTP 403 Forbidden error. If set to false, '
'passwords are automatically truncated to the '
'maximum length.')],
'identity': [
cfg.StrOpt('default_domain_id', default='default',
help='This references the domain to use for all '