cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sw...@apache.org
Subject [1/6] git commit: updated refs/heads/master to 678b28f
Date Thu, 26 May 2016 02:54:42 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 570b676b1 -> 678b28f27


CLOUDSTACK-6975: Prevent dnsmasq from starting on backup redundant RvR.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/38b3bdd4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/38b3bdd4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/38b3bdd4

Branch: refs/heads/master
Commit: 38b3bdd488745b3ded6d54ae2d3093842bc4d763
Parents: 4db1c01
Author: dean.close <dean.close@icloudhosting.com>
Authored: Mon May 9 11:34:47 2016 +0100
Committer: dean.close <dean.close@icloudhosting.com>
Committed: Mon May 9 11:34:47 2016 +0100

----------------------------------------------------------------------
 systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/38b3bdd4/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
index 023b180..3f102e6 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
@@ -54,7 +54,8 @@ class CsDhcp(CsDataBag):
         self.cloud.commit()
 
         # We restart DNSMASQ every time the configure.py is called in order to avoid lease
problems.
-        CsHelper.service("dnsmasq", "restart")
+        if not self.cl.is_redundant() or self.cl.is_master():
+            CsHelper.service("dnsmasq", "restart")
 
     def configure_server(self):
         # self.conf.addeq("dhcp-hostsfile=%s" % DHCP_HOSTS)


Mime
View raw message