64eba422ff
The change also implements blueprint agent-logging (this was due to the fact that the existing logging in the agents did not work with the change) Devstack support for the above is in https://review.openstack.org/10267 Notes: - The service and agent can be run with multiple configuration files by using the CLI parameters --config-file <filename> - The agent now makes use of the logging and debugging flags defined in quantum.conf. This follows the standard common configuration command line rules. Change-Id: I3bd7701526a950c360d7c2cf14b31045010b46ca
42 lines
1.3 KiB
Python
42 lines
1.3 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright 2012 Red Hat, 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 quantum.openstack.common import cfg
|
|
|
|
|
|
database_opts = [
|
|
cfg.StrOpt('sql_connection', default='sqlite://'),
|
|
cfg.IntOpt('sql_max_retries', default=-1),
|
|
cfg.IntOpt('reconnect_interval', default=2),
|
|
]
|
|
|
|
ovs_opts = [
|
|
cfg.StrOpt('integration_bridge', default='br-int'),
|
|
cfg.StrOpt('openflow_controller', default='127.0.0.1:6633'),
|
|
cfg.StrOpt('openflow_rest_api', default='127.0.0.1:8080'),
|
|
]
|
|
|
|
agent_opts = [
|
|
cfg.BoolOpt('target_v2_api', default=True),
|
|
cfg.IntOpt('polling_interval', default=2),
|
|
cfg.StrOpt('root_helper', default='sudo'),
|
|
]
|
|
|
|
|
|
cfg.CONF.register_opts(database_opts, "DATABASE")
|
|
cfg.CONF.register_opts(ovs_opts, "OVS")
|
|
cfg.CONF.register_opts(agent_opts, "AGENT")
|