ea9aeb6de0
Fixes bug #1121605 This patch replacest the nvp_controller_connection configuration option with a set of options more intutitive to user which also avoid repetitions in ini files. In order to simplify the configuration of the plugin, this patch also removes named clusters. As the plugin supports a single cluster at the moment, this can be simply specified in the [DEFAULT] configuration section. Also, this patch restrucures nvp_cluster.NvpCluster so that per-cluster configuration options are not store anymore multiple times. Change-Id: Id5f84220122d7c5f3239e3333cb772247d1ed05e
123 lines
5.7 KiB
Python
123 lines
5.7 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright 2012 Nicira, Inc.
|
|
#
|
|
# 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
|
|
|
|
from quantum import scheduler
|
|
|
|
nvp_opts = [
|
|
cfg.IntOpt('max_lp_per_bridged_ls', default=64,
|
|
help=_("Maximum number of ports of a logical switch on a "
|
|
"bridged transport zone (default 64)")),
|
|
cfg.IntOpt('max_lp_per_overlay_ls', default=256,
|
|
help=_("Maximum number of ports of a logical switch on an "
|
|
"overlay transport zone (default 64)")),
|
|
cfg.IntOpt('concurrent_connections', default=5,
|
|
help=_("Maximum concurrent connections")),
|
|
cfg.IntOpt('nvp_gen_timeout', default=-1,
|
|
help=_("Number of seconds a generation id should be valid for "
|
|
"(default -1 meaning do not time out)")),
|
|
cfg.StrOpt('metadata_mode', default='access_network',
|
|
help=_("If set to access_network this enables a dedicated "
|
|
"connection to the metadata proxy for metadata server "
|
|
"access via Quantum router. If set to dhcp_host_route "
|
|
"this enables host route injection via the dhcp agent. "
|
|
"This option is only useful if running on a host that "
|
|
"does not support namespaces otherwise access_network "
|
|
"should be used.")),
|
|
cfg.BoolOpt('enable_metadata_access_network', default=True,
|
|
help=_("Enables dedicated connection to the metadata proxy "
|
|
"for metadata server access via Quantum router")),
|
|
]
|
|
|
|
connection_opts = [
|
|
cfg.StrOpt('nvp_user',
|
|
default='admin',
|
|
help=_('User name for NVP controllers in this cluster')),
|
|
cfg.StrOpt('nvp_password',
|
|
default='admin',
|
|
secret=True,
|
|
help=_('Password for NVP controllers in this cluster')),
|
|
cfg.IntOpt('req_timeout',
|
|
default=30,
|
|
help=_('Total time limit for a cluster request')),
|
|
cfg.IntOpt('http_timeout',
|
|
default=10,
|
|
help=_('Time before aborting a request')),
|
|
cfg.IntOpt('retries',
|
|
default=2,
|
|
help=_('Number of time a request should be retried')),
|
|
cfg.IntOpt('redirects',
|
|
default=2,
|
|
help=_('Number of times a redirect should be followed')),
|
|
cfg.ListOpt('nvp_controllers',
|
|
help=_("Lists the NVP controllers in this cluster")),
|
|
]
|
|
|
|
cluster_opts = [
|
|
cfg.StrOpt('default_tz_uuid',
|
|
help=_("This is uuid of the default NVP Transport zone that "
|
|
"will be used for creating tunneled isolated "
|
|
"\"Quantum\" networks. It needs to be created in NVP "
|
|
"before starting Quantum with the nvp plugin.")),
|
|
cfg.StrOpt('nvp_cluster_uuid',
|
|
help=_("Optional paramter identifying the UUID of the cluster "
|
|
"in NVP. This can be retrieved from NVP management "
|
|
"console \"admin\" section.")),
|
|
cfg.StrOpt('default_l3_gw_service_uuid',
|
|
help=_("Unique identifier of the NVP L3 Gateway service "
|
|
"which will be used for implementing routers and "
|
|
"floating IPs")),
|
|
cfg.StrOpt('default_l2_gw_service_uuid',
|
|
help=_("Unique identifier of the NVP L2 Gateway service "
|
|
"which will be used by default for network gateways")),
|
|
cfg.StrOpt('default_interface_name', default='breth0',
|
|
help=_("Name of the interface on a L2 Gateway transport node"
|
|
"which should be used by default when setting up a "
|
|
"network connection")),
|
|
]
|
|
|
|
# Register the configuration options
|
|
cfg.CONF.register_opts(connection_opts)
|
|
cfg.CONF.register_opts(cluster_opts)
|
|
cfg.CONF.register_opts(nvp_opts, "NVP")
|
|
cfg.CONF.register_opts(scheduler.AGENTS_SCHEDULER_OPTS)
|
|
# NOTE(armando-migliaccio): keep the following code until we support
|
|
# NVP configuration files in older format (Grizzly or older).
|
|
# ### BEGIN
|
|
controller_depr = cfg.MultiStrOpt('nvp_controller_connection',
|
|
help=_("Describes a connection to a single "
|
|
"controller. A different connection "
|
|
"for each controller in the cluster "
|
|
"can be specified; there must be at "
|
|
"least one connection per cluster."))
|
|
|
|
host_route_depr = cfg.BoolOpt('metadata_dhcp_host_route', default=None)
|
|
|
|
|
|
def register_deprecated(conf):
|
|
conf.register_opts([host_route_depr])
|
|
multi_parser = cfg.MultiConfigParser()
|
|
read_ok = multi_parser.read(conf.config_file)
|
|
if len(read_ok) != len(conf.config_file):
|
|
raise cfg.Error("Some config files were not parsed properly")
|
|
|
|
for parsed_file in multi_parser.parsed:
|
|
for section in parsed_file.keys():
|
|
if section not in conf and section.startswith("CLUSTER:"):
|
|
conf.register_opts(cluster_opts + [controller_depr], section)
|
|
# ### END
|