openstack/ironic
Code Issues Proposed changes

Merge "Remove unnesessary description for config parameters in cinder group"

Browse Source
This commit is contained in:
Zuul 2017-11-01 12:52:50 +00:00 committed by Gerrit Code Review
commit 56a52f2d7e
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etc/ironic/ironic.conf.sample
View File

@ -907,9 +907,7 @@
#
# Number of retries in the case of a failed action (currently
# only used when detaching volumes). This option is part of
# boot-from-volume work, which is not currently exposed to
# users. (integer value)
# only used when detaching volumes). (integer value)
#action_retries = 3
# Retry interval in seconds in the case of a failed action
@ -970,8 +968,7 @@
#project_name = <None>
# Client retries in the case of a failed request connection.
# This option is part of boot-from-volume work, which is not
# currently exposed to users. (integer value)
# (integer value)
#retries = 3
# Tenant ID (string value)
@ -987,9 +984,7 @@
#trust_id = <None>
# URL for connecting to cinder. If set, the value must start
# with either http:// or https://. This option is part of
# boot-from-volume work, which is not currently exposed to
# users. (uri value)
# with either http:// or https://. (uri value)
#url = <None>
# User's domain id (string value)

10
ironic/conf/cinder.py
View File

@ -20,20 +20,16 @@ opts = [
cfg.URIOpt('url',
schemes=('http', 'https'),
help=_('URL for connecting to cinder. If set, the value must '
'start with either http:// or https://. This option is '
'part of boot-from-volume work, which is not currently '
'exposed to users.')),
'start with either http:// or https://.')),
cfg.IntOpt('retries',
default=3,
help=_('Client retries in the case of a failed request '
'connection. This option is part of boot-from-volume '
'work, which is not currently exposed to users.')),
'connection.')),
cfg.IntOpt('action_retries',
default=3,
help=_('Number of retries in the case of a failed '
'action (currently only used when detaching '
'volumes). This option is part of boot-from-volume '
'work, which is not currently exposed to users.')),
'volumes).')),
cfg.IntOpt('action_retry_interval',
default=5,
help=_('Retry interval in seconds in the case of a failed '