Merge "Config Options: Improve help text for Ipv6 options"
This commit is contained in:
commit
990ff13646
|
@ -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) 2016 Intel, Inc.
|
||||||
# Copyright (c) 2013 OpenStack Foundation
|
# Copyright (c) 2013 OpenStack Foundation
|
||||||
# All Rights Reserved.
|
# All Rights Reserved.
|
||||||
|
@ -24,11 +17,24 @@
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
|
|
||||||
ipv6_backend = cfg.StrOpt('ipv6_backend',
|
IPV6_OPTS = [
|
||||||
default='rfc2462',
|
cfg.StrOpt('ipv6_backend',
|
||||||
help='Backend to use for IPv6 generation')
|
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):
|
def register_opts(conf):
|
||||||
|
|
Loading…
Reference in New Issue