openstack
/
ironic
Code Issues Proposed changes

Merge "Remove WARNING from pin_release_version's help"

This commit is contained in:
Jenkins 2017-08-04 02:15:54 +00:00 committed by Gerrit Code Review
parent a60db0a801 4686955d25
commit 92047176ca
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,14 +360,13 @@
# value)
#host = localhost
# WARNING: This configuration option is part of the incomplete
# rolling upgrades work. Do not change this from the default
# value. Used for rolling upgrades. Setting this option
# downgrades (or pins) the internal ironic RPC communication
# to the specified version to enable communication with older
# services. When doing a rolling upgrade from version X to
# version Y, set (pin) this to X. To unpin, leave it unset.
# Defaults to using the newest possible RPC behavior. (string
# Used for rolling upgrades. Setting this option downgrades
# (or pins) the internal ironic RPC communication and database
# objects to their respective versions, so they are compatible
# with older services. When doing a rolling upgrade from
# version N to version N+1, set (to pin) this to N. To unpin
# (default), leave it unset and the latest versions of RPC
# communication and database objects will be used. (string
# value)
# Allowed values: ocata, 8.0, 7.0
#pin_release_version = <None>

16
ironic/conf/default.py
View File

@ -271,16 +271,14 @@ service_opts = [
cfg.StrOpt('pin_release_version',
choices=versions.RELEASE_VERSIONS,
# TODO(xek): mutable=True,
help=_('WARNING: This configuration option is part of the '
'incomplete rolling upgrades work. Do not change this '
'from the default value. '
'Used for rolling upgrades. Setting this option '
help=_('Used for rolling upgrades. Setting this option '
'downgrades (or pins) the internal ironic RPC '
'communication to the specified version to enable '
'communication with older services. When doing a '
'rolling upgrade from version X to version Y, set (pin) '
'this to X. To unpin, leave it unset. Defaults to '
'using the newest possible RPC behavior.')),
'communication and database objects to their respective '
'versions, so they are compatible with older services. '
'When doing a rolling upgrade from version N to version '
'N+1, set (to pin) this to N. To unpin (default), leave '
'it unset and the latest versions of RPC communication '
'and database objects will be used.')),
]
utils_opts = [