openstack
/
nova
Code Issues Proposed changes

Merge "Config Options: Improve help text for Ipv6 options"

This commit is contained in:
Jenkins 2016-08-22 02:16:20 +00:00 committed by Gerrit Code Review
parent 24c75362dd 07f7aa3664
commit 990ff13646
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
nova/conf/ipv6.py
View File

@ -1,10 +1,3 @@
# needs:fix_opt_description
# needs:check_deprecation_status
# needs:check_opt_group_and_type
# needs:fix_opt_description_indentation
# needs:fix_opt_registration_consistency
# Copyright (c) 2016 Intel, Inc.
# Copyright (c) 2013 OpenStack Foundation
# All Rights Reserved.
@ -24,11 +17,24 @@
from oslo_config import cfg
ipv6_backend = cfg.StrOpt('ipv6_backend',
default='rfc2462',
help='Backend to use for IPv6 generation')
IPV6_OPTS = [
cfg.StrOpt('ipv6_backend',
default='rfc2462',
choices=('rfc2462', 'account_identifier'),
help="""
Abstracts out IPv6 address generation to pluggable backends.
IPV6_OPTS = [ipv6_backend]
nova-network can be put into dual-stack mode, so that it uses
both IPv4 and IPv6 addresses. In dual-stack mode, by default, instances
acquire IPv6 global unicast addresses with the help of stateless address
auto-configuration mechanism.
Related options:
* use_neutron: this option only works with nova-network.
* use_ipv6: this option only works if ipv6 is enabled for nova-network.
"""),
]
def register_opts(conf):