openstack/nova
Code Issues Proposed changes

Merge "Improve help text of image_file_url"

Browse Source
This commit is contained in:
Jenkins 2016-08-05 08:20:46 +00:00 committed by Gerrit Code Review
commit e99c366543
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
nova/conf/image_file_url.py
View File

@ -22,7 +22,6 @@
from oslo_config import cfg from oslo_config import cfg
from nova.i18n import _
image_file_url_group = cfg.OptGroup( image_file_url_group = cfg.OptGroup(
'image_file_url', 'image_file_url',
@ -30,35 +29,41 @@ image_file_url_group = cfg.OptGroup(
filesystems = cfg.ListOpt( filesystems = cfg.ListOpt(
name='filesystems', name='filesystems',
deprecated_for_removal=True,
deprecated_reason='The feature to download images from glance via '
'filesystem is not used and will be removed in the '
'future.',
default=[], default=[],
help=_('List of file systems that are configured ' deprecated_for_removal=True,
'in this file in the ' deprecated_reason="""
'image_file_url:<list entry name> ' The feature to download images from glance via filesystem is not used and will
'sections')) be removed in the future.
""",
help="""
List of file systems that are configured in this file in the
image_file_url:<list entry name> sections
""")
# NOTE(jbresnah) because the group under which these options are added is # NOTE(jbresnah) because the group under which these options are added is
# dynamically determined these options need to stay out of global space # dynamically determined these options need to stay out of global space
# or they will confuse generate_sample.sh # or they will confuse generate_sample.sh
filesystem_opts = [ filesystem_opts = [
cfg.StrOpt('id', cfg.StrOpt('id',
help=_('A unique ID given to each file system. This is '
'value is set in Glance and agreed upon here so '
'that the operator knowns they are dealing with '
'the same file system.'),
deprecated_for_removal=True, deprecated_for_removal=True,
deprecated_reason='The feature to download images from glance ' deprecated_reason="""
'via filesystem is not used and will be ' The feature to download images from glance via filesystem is not used and will
'removed in the future.'), be removed in the future.
""",
help="""
A unique ID given to each file system. This is value is set in Glance and
agreed upon here so that the operator knowns they are dealing with the same
file system.
"""),
cfg.StrOpt('mountpoint', cfg.StrOpt('mountpoint',
help=_('The path at which the file system is mounted.'),
deprecated_for_removal=True, deprecated_for_removal=True,
deprecated_reason='The feature to download images from glance ' deprecated_reason="""
'via filesystem is not used and will be ' The feature to download images from glance via filesystem is not used and will
'removed in the future.'), be removed in the future.
""",
help="""
The path at which the file system is mounted.
"""),
] ]
ALL_OPTS = [filesystems] ALL_OPTS = [filesystems]