0a4596aa20
In some cases we would want to refrain from cleaning up specific openvswitch ports. In Octavia, the health manager service is using a predefined[1] openvswitch port which will gets nuked by the ovs_cleanup script in the boot process. That port is created by the operating system NIC configuration file (by using OVS_EXTRA[2]), but due to the order of actions in the boot process, the ovs_cleanup script gets invoked by systemd only at a later stage. As a result the port will be deleted each time and the Octavia health manager service will fail to bind. This patch takes advantage of the 'external_ids' column that already exists for ovs ports, in order to filter out ports we would like to skip. We filter those ports by adding 'skip_cleanup' to the 'external_ids' column. It is important to note that this will work if we append the following to the port: -- set Interface o-hm0 external_ids:skip_cleanup=true" Related-Bug: #1685223 [1] http://git.openstack.org/cgit/openstack/octavia/tree/devstack/plugin.sh?h=stable/ocata#n190 [2] https://github.com/osrg/openvswitch/blob/master/rhel/README.RHEL#L102 Change-Id: If483d0ee027596999370ab0d21b1743d4ef16acb
119 lines
3.8 KiB
Python
119 lines
3.8 KiB
Python
# Copyright (c) 2012 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
|
|
from oslo_log import log as logging
|
|
|
|
from neutron._i18n import _LI
|
|
from neutron.agent.common import ovs_lib
|
|
from neutron.agent.linux import interface
|
|
from neutron.agent.linux import ip_lib
|
|
from neutron.common import config
|
|
from neutron.conf.agent import cmd
|
|
from neutron.conf.agent import common as agent_config
|
|
from neutron.conf.agent.l3 import config as l3_config
|
|
from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants
|
|
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
def setup_conf():
|
|
"""Setup the cfg for the clean up utility.
|
|
|
|
Use separate setup_conf for the utility because there are many options
|
|
from the main config that do not apply during clean-up.
|
|
"""
|
|
|
|
conf = cfg.CONF
|
|
cmd.register_cmd_opts(cmd.ovs_opts, conf)
|
|
l3_config.register_l3_agent_config_opts(l3_config.OPTS, conf)
|
|
conf.register_opts(interface.OPTS)
|
|
agent_config.register_interface_driver_opts_helper(conf)
|
|
return conf
|
|
|
|
|
|
def get_bridge_deletable_ports(br):
|
|
"""
|
|
Return a list of OVS Bridge ports, excluding the ports who should not be
|
|
cleaned. such ports are tagged with the 'skip_cleanup' key in external_ids.
|
|
"""
|
|
return [port.port_name for port in br.get_vif_ports()
|
|
if constants.SKIP_CLEANUP not in
|
|
br.get_port_external_ids(port.port_name)]
|
|
|
|
|
|
def collect_neutron_ports(bridges):
|
|
"""Collect ports created by Neutron from OVS."""
|
|
ports = []
|
|
for bridge in bridges:
|
|
ovs = ovs_lib.OVSBridge(bridge)
|
|
ports += get_bridge_deletable_ports(ovs)
|
|
return ports
|
|
|
|
|
|
def delete_neutron_ports(ports):
|
|
"""Delete non-internal ports created by Neutron
|
|
|
|
Non-internal OVS ports need to be removed manually.
|
|
"""
|
|
for port in ports:
|
|
device = ip_lib.IPDevice(port)
|
|
if device.exists():
|
|
device.link.delete()
|
|
LOG.info(_LI("Deleting port: %s"), port)
|
|
|
|
|
|
def main():
|
|
"""Main method for cleaning up OVS bridges.
|
|
|
|
The utility cleans up the integration bridges used by Neutron.
|
|
"""
|
|
|
|
conf = setup_conf()
|
|
conf()
|
|
config.setup_logging()
|
|
|
|
configuration_bridges = set([conf.ovs_integration_bridge,
|
|
conf.external_network_bridge])
|
|
ovs = ovs_lib.BaseOVS()
|
|
ovs_bridges = set(ovs.get_bridges())
|
|
available_configuration_bridges = configuration_bridges & ovs_bridges
|
|
|
|
if conf.ovs_all_ports:
|
|
bridges = ovs_bridges
|
|
else:
|
|
bridges = available_configuration_bridges
|
|
|
|
# Collect existing ports created by Neutron on configuration bridges.
|
|
# After deleting ports from OVS bridges, we cannot determine which
|
|
# ports were created by Neutron, so port information is collected now.
|
|
ports = collect_neutron_ports(available_configuration_bridges)
|
|
|
|
for bridge in bridges:
|
|
LOG.info(_LI("Cleaning bridge: %s"), bridge)
|
|
ovs = ovs_lib.OVSBridge(bridge)
|
|
if conf.ovs_all_ports:
|
|
port_names = ovs.get_port_name_list()
|
|
else:
|
|
port_names = get_bridge_deletable_ports(ovs)
|
|
for port_name in port_names:
|
|
ovs.delete_port(port_name)
|
|
|
|
# Remove remaining ports created by Neutron (usually veth pair)
|
|
delete_neutron_ports(ports)
|
|
|
|
LOG.info(_LI("OVS cleanup completed successfully"))
|