From 07f7aa3664efb00a91f076eacf492b364dd38aeb Mon Sep 17 00:00:00 2001 From: Pushkar Umaranikar Date: Wed, 18 May 2016 19:04:37 +0000 Subject: [PATCH] Config Options: Improve help text for Ipv6 options This commit adds additional help text to the config options of the "nova/conf/Ipv6.py" Change-Id: Ib2d9f66ac744f05a5a8999a28c917e00a18ec55d Implements: blueprint centralize-config-options-newton --- nova/conf/ipv6.py | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/nova/conf/ipv6.py b/nova/conf/ipv6.py index 7580cafad63b..59bfb2762842 100644 --- a/nova/conf/ipv6.py +++ b/nova/conf/ipv6.py @@ -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):