apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Corrected bug (I love tests)

Browse Source 
The dhcp server will only start listening after a host has been added
In this condition, HUP is not enough
Changed so that if it is adding a first host it will restart the server
This commit is contained in:
Ian Southam 2014-08-21 14:56:04 +02:00 committed by wilderrodrigues
parent 0e8c79c7f1
commit c318bd6337
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
systemvm/patches/debian/config/opt/cloud/bin/CsDhcp.py
View File

@ -44,9 +44,10 @@ class CsDhcp(object):
logging.debug("Hosts file is up to date")
diff = dnsmasq.compare_dnsmasq(dnsmasqb4)
if len(diff) > 0:
self.updated = True
dnsmasq.updated = True
dnsmasq.delete_leases(diff)
dnsmasq.write_dnsmasq()
dnsmasq.first_host = dnsmasqb4.first_host
dnsmasq.configure_server()
class CsDnsMasq(object):
@ -58,6 +59,7 @@ class CsDnsMasq(object):
self.updated = False
self.devinfo = CsHelper.get_device_info()
self.devs = []
self.first_host = False
if preload:
self.add_host("127.0.0.1", "localhost")
self.add_host("::1", "localhost ip6-localhost ip6-loopback")
@ -108,14 +110,20 @@ class CsDnsMasq(object):
line = "dhcp-option=tag:interface-%s,15,%s" % (device,gn.get_domain())
self.updated = self.updated or CsHelper.addifmissing(CLOUD_CONF, line)
if self.updated:
CsHelper.hup_dnsmasq("dnsmasq", "dnsmasq")
if self.first_host:
CsHelper.service("dnsmasq", "restart")
else:
CsHelper.hup_dnsmasq("dnsmasq", "dnsmasq")
def parse_dnsmasq(self):
self.first_host = False
try:
for line in open(DHCP_HOSTS):
self.list.append(line.strip())
if len(self.list) == 0:
self.first_host = True
except IOError:
pass
self.first_host = True
def parse_hosts(self):
for line in open("/etc/hosts"):