Merge pull request #1514 from dsclose/CLOUDSTACK-6975 CLOUDSTACK-6975: Prevent dnsmasq from starting on backup redundant RvRRebase of PR #1509 against the 4.7 branch as requested by @swill
One LGTM from @ustcweizhou carried from previous PR. Previous PR will be closed. Description from PR #1509: CLOUDSTACK-6975 refers to service monitoring bringing up dnsmasq but this is no-longer accurate, as service monitoring is not active on the post-4.6 routers. These routers still suffer an essentially identical issue, however, because "dnsmasq needs to be restarted each time configure.py is called in order to avoid lease problems." As such, dnsmasq is still running on backup RvRs, causing the issues described in CLOUDSTACK-6975. This PR is based on a patch submitted by @ustcweizhou. The code now checks the redundant state of the router before restarting dnsmasq. RvR networks without this patch have dnsmasq running on both master and backup routers. RvR networks with this patch have dnsmasq running on only the master router. * pr/1514: CLOUDSTACK-6975: Prevent dnsmasq from starting on backup redundant RvR. Signed-off-by: Will Stevens <williamstev...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5ccebf0f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5ccebf0f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5ccebf0f Branch: refs/heads/4.8 Commit: 5ccebf0f2b10d1cbc0a97f441e0c00646d84fcad Parents: 82f1198 38b3bdd Author: Will Stevens <williamstev...@gmail.com> Authored: Wed May 25 22:52:55 2016 -0400 Committer: Will Stevens <williamstev...@gmail.com> Committed: Wed May 25 22:52:55 2016 -0400 ---------------------------------------------------------------------- systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
