Merge "Move mlnx agent to be under ml2/drivers/mlnx"
This commit is contained in:
commit
20fe763a65
|
@ -9,9 +9,6 @@
|
||||||
# physical_interface_mappings =
|
# physical_interface_mappings =
|
||||||
# Example: physical_interface_mappings = default:eth2
|
# Example: physical_interface_mappings = default:eth2
|
||||||
|
|
||||||
# (StrOpt) Type of Network Interface to allocate for VM:
|
|
||||||
# direct or hosdev according to libvirt terminology
|
|
||||||
# vnic_type = mlnx_direct
|
|
||||||
|
|
||||||
# (StrOpt) Eswitch daemon end point connection url
|
# (StrOpt) Eswitch daemon end point connection url
|
||||||
# daemon_endpoint = 'tcp://127.0.0.1:60001'
|
# daemon_endpoint = 'tcp://127.0.0.1:60001'
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
# Copyright 2015 Mellanox Technologies, Ltd
|
||||||
|
#
|
||||||
|
# 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 neutron.plugins.ml2.drivers.mlnx.agent import eswitch_neutron_agent
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
eswitch_neutron_agent.main()
|
|
@ -1,4 +1,4 @@
|
||||||
The Neutron Mellanox plugin has removed from the tree in Kilo.
|
The Neutron Mellanox plugin has been removed from the tree in Kilo.
|
||||||
This directory includes Mellanox L2 agent for MLNX mechanism driver.
|
This directory includes Mellanox L2 agent for MLNX mechanism driver.
|
||||||
For more details, please refer to the following link:
|
For more details, please refer to the following link:
|
||||||
https://wiki.openstack.org/wiki/Mellanox-Neutron-ML2
|
https://wiki.openstack.org/wiki/Mellanox-Neutron-ML2
|
|
@ -13,7 +13,6 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
from networking_mlnx.plugins.mlnx.agent import constants
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
from neutron.agent.common import config
|
from neutron.agent.common import config
|
||||||
|
@ -24,10 +23,6 @@ eswitch_opts = [
|
||||||
cfg.ListOpt('physical_interface_mappings',
|
cfg.ListOpt('physical_interface_mappings',
|
||||||
default=DEFAULT_INTERFACE_MAPPINGS,
|
default=DEFAULT_INTERFACE_MAPPINGS,
|
||||||
help=_("List of <physical_network>:<physical_interface>")),
|
help=_("List of <physical_network>:<physical_interface>")),
|
||||||
cfg.StrOpt('vnic_type',
|
|
||||||
default=constants.VIF_TYPE_DIRECT,
|
|
||||||
choices=(constants.VIF_TYPE_DIRECT, constants.VIF_TYPE_HOSTDEV),
|
|
||||||
help=_("Type of VM network interface")),
|
|
||||||
cfg.StrOpt('daemon_endpoint',
|
cfg.StrOpt('daemon_endpoint',
|
||||||
default='tcp://127.0.0.1:60001',
|
default='tcp://127.0.0.1:60001',
|
||||||
help=_('eswitch daemon end point')),
|
help=_('eswitch daemon end point')),
|
|
@ -16,14 +16,15 @@
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
from networking_mlnx.plugins.mlnx.agent import mlnx_eswitch_neutron_agent
|
from networking_mlnx.plugins.ml2.drivers.mlnx.agent import (
|
||||||
|
mlnx_eswitch_neutron_agent)
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
|
|
||||||
from neutron.i18n import _LE, _LI
|
from neutron.i18n import _LE, _LI
|
||||||
from neutron.common import config as common_config
|
from neutron.common import config as common_config
|
||||||
from neutron.common import utils
|
from neutron.common import utils
|
||||||
from neutron.plugins.mlnx.agent import config # noqa
|
from neutron.plugins.ml2.drivers.mlnx.agent import config # noqa
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
|
@ -1,6 +1 @@
|
||||||
# The order of packages is significant, because pip processes them in the
|
|
||||||
# order
|
|
||||||
# of appearance. Changing the order has an impact on the overall integration
|
|
||||||
# process, which may cause wedges in the gate later.
|
|
||||||
|
|
||||||
networking_mlnx
|
networking_mlnx
|
||||||
|
|
|
@ -96,7 +96,7 @@ console_scripts =
|
||||||
neutron-l3-agent = neutron.cmd.eventlet.agents.l3:main
|
neutron-l3-agent = neutron.cmd.eventlet.agents.l3:main
|
||||||
neutron-linuxbridge-agent = neutron.plugins.linuxbridge.agent.linuxbridge_neutron_agent:main
|
neutron-linuxbridge-agent = neutron.plugins.linuxbridge.agent.linuxbridge_neutron_agent:main
|
||||||
neutron-metadata-agent = neutron.cmd.eventlet.agents.metadata:main
|
neutron-metadata-agent = neutron.cmd.eventlet.agents.metadata:main
|
||||||
neutron-mlnx-agent = neutron.plugins.mlnx.agent.eswitch_neutron_agent:main
|
neutron-mlnx-agent = neutron.cmd.eventlet.plugins.mlnx_neutron_agent:main
|
||||||
neutron-nec-agent = neutron.cmd.eventlet.plugins.nec_neutron_agent:main
|
neutron-nec-agent = neutron.cmd.eventlet.plugins.nec_neutron_agent:main
|
||||||
neutron-netns-cleanup = neutron.cmd.netns_cleanup:main
|
neutron-netns-cleanup = neutron.cmd.netns_cleanup:main
|
||||||
neutron-ns-metadata-proxy = neutron.cmd.eventlet.agents.metadata_proxy:main
|
neutron-ns-metadata-proxy = neutron.cmd.eventlet.agents.metadata_proxy:main
|
||||||
|
|
Loading…
Reference in New Issue