From 7700e940fff587d8dd7f0994171ae7b7e23d149c Mon Sep 17 00:00:00 2001 From: Ian Southam Date: Tue, 17 Feb 2015 14:13:43 +0100 Subject: [PATCH] dnsmasq should restart if config changes and hup if hosts change --- .../patches/debian/config/opt/cloud/bin/cs/CsDatabag.py | 2 +- .../patches/debian/config/opt/cloud/bin/cs/CsDhcp.py | 9 ++++----- .../debian/config/opt/cloud/bin/cs/CsRedundant.py | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py index b2e559de495..a3818e572a8 100644 --- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py @@ -132,7 +132,7 @@ class CsCmdLine(CsDataBag): def get_router_password(self): if "router_password" in self.idata(): return self.idata()['router_password'] - + ''' Generate a password based on the router id just to avoid hard-coded passwd. Remark: if for some reason 1 router gets configured, the other one will have a different password. 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 0a1c8e2e3ee..1b76b86e8b9 100644 --- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py @@ -47,11 +47,10 @@ class CsDhcp(CsDataBag): self.configure_server() self.conf.commit() self.cloud.commit() - if self.cloud.is_changed(): - if length < 2: - CsHelper.service("dnsmasq", "restart") - else: - CsHelper.hup_dnsmasq("dnsmasq", "dnsmasq") + if self.conf.is_changed(): + CsHelper.service("dnsmasq", "restart") + elif self.cloud.is_changed(): + CsHelper.hup_dnsmasq("dnsmasq", "dnsmasq") def configure_server(self): # self.conf.addeq("dhcp-hostsfile=%s" % DHCP_HOSTS) diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py index a947fd1cc3e..7ada710fe33 100644 --- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py @@ -122,7 +122,7 @@ class CsRedundant(object): file.search(" state ", " state %s" % "EQUAL") file.search(" virtual_router_id ", " virtual_router_id %s" % self.cl.get_router_id()) file.greplace("[RROUTER_BIN_PATH]", self.CS_ROUTER_DIR) - file.section("authentication {", "}", [ " auth_type AH \n", " auth_pass %s\n" % self.cl.get_router_password()] ) + file.section("authentication {", "}", [" auth_type AH \n", " auth_pass %s\n" % self.cl.get_router_password()]) file.section("virtual_ipaddress {", "}", self._collect_ips()) file.commit()