Comment 11 for bug 1855888

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

Reviewed: https://review.opendev.org/700059
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=54e1a6b1bc378c0745afc03987d0fea241b826ae
Submitter: Zuul
Branch: stable/rocky

commit 54e1a6b1bc378c0745afc03987d0fea241b826ae
Author: Moshe Levi <email address hidden>
Date: Tue Dec 10 23:11:54 2019 +0200

    don't clear skb mark when ovs is hw-offload enabled

    skb mark is not supported when using ovs hw-offload and using it
    breaks the vxlan offload.

    This patch clear skb mark only if ovs hw-offload is disabled.
    This should be fine as ovs with hw-offload runs on the
    compute node (DVR is not supported), so clear the skb mark for
    the qrouter is not needed.

    Closes-Bug: #1855888

    Conflicts:
        neutron/agent/common/ovs_lib.py

    Change-Id: I71f45fcd9b7e7bdacaafc7fa96c775e88333ab48
    (cherry picked from commit a75ec08ddb6a672ba685a11ba3f7df1569497723)
    (cherry picked from commit bee5059ccb35e23d3c84ae8f959fa695f8cae931)