Fix scheduling of DVR routers to not stop scheduling once
csnat portion was scheduled. See bug report for failing
scenario.
This partially reverts
commit 3794b4a83e68041e24b715135f0ccf09a5631178
and fixes bug 1374473 by moving csnat scheduling
after general dvr router scheduling, so double binding does
not happen.
Closes-Bug: #1472163
Related-Bug: #1374473
(cherry picked from commit 236e408272bcb9b8e957524864e571b5afdc4623)
Reviewed: https:/ /review. openstack. org/241816 /git.openstack. org/cgit/ openstack/ neutron/ commit/ ?id=bc43214239a 551443ebafe9e9b 0d595150a61c51
Committed: https:/
Submitter: Jenkins
Branch: stable/kilo
commit bc43214239a5514 43ebafe9e9b0d59 5150a61c51
Author: Oleg Bondarev <email address hidden>
Date: Tue Jul 7 12:02:58 2015 +0300
DVR: fix router scheduling
Fix scheduling of DVR routers to not stop scheduling once
csnat portion was scheduled. See bug report for failing
scenario.
This partially reverts e24b715135f0ccf 09a5631178
commit 3794b4a83e68041
and fixes bug 1374473 by moving csnat scheduling
after general dvr router scheduling, so double binding does
not happen.
Closes-Bug: #1472163 8e957524864e571 b5afdc4623)
Related-Bug: #1374473
(cherry picked from commit 236e408272bcb9b
Conflicts:
neutron/ scheduler/ l3_agent_ scheduler. py
neutron/ tests/unit/ extensions/ test_agent. py
neutron/ tests/unit/ plugins/ openvswitch/ test_agent_ scheduler. py
Change-Id: I57c06e2be732e4 7b6cce7c724f6b2 55ea2d8fa32