diff --git a/nova/conf/__init__.py b/nova/conf/__init__.py index 547390164a68..91f7b7d8e342 100644 --- a/nova/conf/__init__.py +++ b/nova/conf/__init__.py @@ -37,7 +37,6 @@ from nova.conf import flavors from nova.conf import glance from nova.conf import guestfs from nova.conf import hyperv -from nova.conf import ipv6 from nova.conf import ironic from nova.conf import key_manager from nova.conf import keystone @@ -91,7 +90,6 @@ glance.register_opts(CONF) guestfs.register_opts(CONF) hyperv.register_opts(CONF) mks.register_opts(CONF) -ipv6.register_opts(CONF) ironic.register_opts(CONF) key_manager.register_opts(CONF) keystone.register_opts(CONF) diff --git a/nova/conf/api.py b/nova/conf/api.py index 8852a993938e..a9b9535c209f 100644 --- a/nova/conf/api.py +++ b/nova/conf/api.py @@ -364,36 +364,6 @@ request. The value should be the full dot-separated path to the class to use. Possible values: * Any valid dot-separated class path that can be imported. -"""), - cfg.BoolOpt("enable_network_quota", - deprecated_for_removal=True, - deprecated_since="14.0.0", - deprecated_reason=""" -CRUD operations on tenant networks are only available when using nova-network -and nova-network is itself deprecated.""", - default=False, - help=""" -This option is used to enable or disable quota checking for tenant networks. - -Related options: - -* quota_networks -"""), - cfg.IntOpt("quota_networks", - deprecated_for_removal=True, - deprecated_since="14.0.0", - deprecated_reason=""" -CRUD operations on tenant networks are only available when using nova-network -and nova-network is itself deprecated.""", - default=3, - min=0, - help=""" -This option controls the number of private networks that can be created per -project (or per tenant). - -Related options: - -* enable_network_quota """), ] diff --git a/nova/conf/ipv6.py b/nova/conf/ipv6.py deleted file mode 100644 index fa1d4abbd615..000000000000 --- a/nova/conf/ipv6.py +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright (c) 2016 Intel, Inc. -# Copyright (c) 2013 OpenStack Foundation -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from oslo_config import cfg - - -IPV6_OPTS = [ - cfg.StrOpt('ipv6_backend', - default='rfc2462', - choices=('rfc2462', 'account_identifier'), - deprecated_for_removal=True, - deprecated_since='16.0.0', - deprecated_reason=""" -nova-network is deprecated, as are any related configuration options. -""", - help=""" -Abstracts out IPv6 address generation to pluggable backends. - -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): - conf.register_opts(IPV6_OPTS) - - -def list_opts(): - return {'DEFAULT': IPV6_OPTS} diff --git a/nova/conf/netconf.py b/nova/conf/netconf.py index d6f0092be399..064bb5f5f134 100644 --- a/nova/conf/netconf.py +++ b/nova/conf/netconf.py @@ -70,20 +70,6 @@ Must be valid within AMQP key. Possible values: * String with hostname, FQDN or IP address. Default is hostname of this host. -"""), - cfg.BoolOpt("use_ipv6", - default=False, - deprecated_for_removal=True, - deprecated_since="16.0.0", - deprecated_reason=""" -nova-network is deprecated, as are any related configuration options. -""", - help=""" -Assign IPv6 and IPv4 addresses when creating instances. - -Related options: - -* use_neutron: this only works with nova-network. """), ] diff --git a/nova/conf/network.py b/nova/conf/network.py index 093effd51c62..12ebec0b60df 100644 --- a/nova/conf/network.py +++ b/nova/conf/network.py @@ -1325,9 +1325,82 @@ Related options: """) ] +ipv6_opts = [ + cfg.BoolOpt('use_ipv6', + default=False, + deprecated_for_removal=True, + deprecated_since='16.0.0', + deprecated_reason=""" +nova-network is deprecated, as are any related configuration options. +""", + help=""" +Assign IPv6 and IPv4 addresses when creating instances. + +Related options: + +* use_neutron: this only works with nova-network. +"""), + cfg.StrOpt('ipv6_backend', + default='rfc2462', + choices=('rfc2462', 'account_identifier'), + deprecated_for_removal=True, + deprecated_since='16.0.0', + deprecated_reason=""" +nova-network is deprecated, as are any related configuration options. +""", + help=""" +Abstracts out IPv6 address generation to pluggable backends. + +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. +"""), +] + + +quota_opts = [ + cfg.BoolOpt('enable_network_quota', + deprecated_for_removal=True, + deprecated_since='14.0.0', + deprecated_reason=""" +CRUD operations on tenant networks are only available when using nova-network +and nova-network is itself deprecated.""", + default=False, + help=""" +This option is used to enable or disable quota checking for tenant networks. + +Related options: + +* quota_networks +"""), + cfg.IntOpt('quota_networks', + deprecated_for_removal=True, + deprecated_since='14.0.0', + deprecated_reason=""" +CRUD operations on tenant networks are only available when using nova-network +and nova-network is itself deprecated.""", + default=3, + min=0, + help=""" +This option controls the number of private networks that can be created per +project (or per tenant). + +Related options: + +* enable_network_quota +"""), +] + ALL_DEFAULT_OPTS = (linux_net_opts + network_opts + ldap_dns_opts - + rpcapi_opts + driver_opts + floating_ip_opts) + + rpcapi_opts + driver_opts + floating_ip_opts + + ipv6_opts + quota_opts) def register_opts(conf):