Comment 1 for bug 996874

What you show here seems correct. I would not make either of the changes you suggest, as they will break things.

It would be best if you could show me the "dump-flows' and "show" output for both "br-tun" and "br-int" on both hosts, and explain what two taps devices should be able to communicate, but can't.

Also, can you confirm that you are running the absolute latest from master? There was a recent commit that added db.commit() that can cause stale db data that results in wiring issues.

Also posting logs from the agents can be helpful.