Comment 9 for bug 1448148

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to neutron (stable/kilo)

Reviewed: https://review.openstack.org/187795
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=81e043f72135682510727c9fa9bafe7efa676717
Submitter: Jenkins
Branch: stable/kilo

commit 81e043f72135682510727c9fa9bafe7efa676717
Author: Kevin Benton <email address hidden>
Date: Thu Apr 30 17:14:44 2015 -0700

    Don't delete port from bridge on delete_port event

    Commit d6a55c17360d1aa8ca91849199987ae71e8600ee added
    logic to the OVS agent to delete a port from the integration
    bridge when a port was deleted on the Neutron side. However,
    this led to several races where whoever created the initial
    port (e.g. Nova, L3 agent, DHCP agent) would be trying to
    remove the port from the bridge at the same time. These
    would result in ugly exceptions on one side or the other.

    The original commit was trying to address the problem where
    the port would maintain connectivity even though it was removed
    from the integration bridge.

    This patch addresses both cases by removing the iptables rules
    for the deleted port and putting it in the dead VLAN so it loses
    connectivity. However, it still leaves the port attached to the
    integration bridge so the original creator can delete it.

    Conflicts:
     neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
     neutron/tests/unit/plugins/openvswitch/agent/test_ovs_neutron_agent.py
     neutron/tests/unit/plugins/openvswitch/test_ovs_tunnel.py

    Related-Bug: #1333365
    Closes-Bug: #1448148
    Change-Id: I7ae7750b7ac7d15325ed9f2d517ca171543b53be
    (cherry picked from commit e007167a700aa5b80ecb48adff0ac36bb330591d)