openstack/ironic
Code Issues Proposed changes

Remove unnesessary description for config parameters in cinder group

Browse Source 
Now that the BFV implementation with iPXE was completed, the
parameters in [cinder] group can be exposed. This patch fixes the help
messages.

Change-Id: I9f20d478334901140f7c1639d8f0bb0612ae5de0
Related-Bug: #1559691
This commit is contained in:
Hironori Shiina 2017-10-30 15:31:04 +09:00
parent 5c72286338
commit b709f5e909
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 # Number of retries in the case of a failed action (currently
# only used when detaching volumes). This option is part of # only used when detaching volumes). (integer value)
# boot-from-volume work, which is not currently exposed to
# users. (integer value)
#action_retries = 3 #action_retries = 3
# Retry interval in seconds in the case of a failed action # Retry interval in seconds in the case of a failed action
@ -970,8 +968,7 @@
#project_name = <None> #project_name = <None>
# Client retries in the case of a failed request connection. # Client retries in the case of a failed request connection.
# This option is part of boot-from-volume work, which is not # (integer value)
# currently exposed to users. (integer value)
#retries = 3 #retries = 3
# Tenant ID (string value) # Tenant ID (string value)
@ -987,9 +984,7 @@
#trust_id = <None> #trust_id = <None>
# URL for connecting to cinder. If set, the value must start # URL for connecting to cinder. If set, the value must start
# with either http:// or https://. This option is part of # with either http:// or https://. (uri value)
# boot-from-volume work, which is not currently exposed to
# users. (uri value)
#url = <None> #url = <None>
# User's domain id (string value) # User's domain id (string value)

10
ironic/conf/cinder.py
View File

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