You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/10/20 08:01:12 UTC

[07/13] git commit: updated refs/heads/master to 6fe5ae0

CLOUDSTACK-8952 - Restart dnsmasq everytime the configure.py runs


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

Branch: refs/heads/master
Commit: c7671f3cdd4cb1b52ff44b44288cb843098bccde
Parents: 2b286ec
Author: Wilder Rodrigues <wr...@schubergphilis.com>
Authored: Thu Oct 15 18:31:03 2015 +0200
Committer: Wilder Rodrigues <wr...@schubergphilis.com>
Committed: Sat Oct 17 12:20:41 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c7671f3c/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 75bc0e3..02e7bd7 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
@@ -48,10 +48,8 @@ class CsDhcp(CsDataBag):
 
         self.configure_server()
 
-        if self.conf.is_changed() or self.cloud.is_changed():
-            CsHelper.service("dnsmasq", "restart")
-        elif self.cloud.is_changed():
-            CsHelper.hup_dnsmasq("dnsmasq", "dnsmasq")
+        # We restart DNSMASQ every time the configure.py is called in order to avoid lease problems.
+        CsHelper.service("dnsmasq", "restart")
 
         self.conf.commit()
         self.cloud.commit()