apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

vr: reload dnsmasq when start vms (#5319)

Browse Source 
* vr: reload dnsmasq when start vms

* vr: fix pycodestyle check error

* vr: delete leases only when needed
This commit is contained in:
Wei Zhou 2021-08-25 03:47:34 +02:00 committed by GitHub
parent f822547c3b
commit 16e4de0c25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py
View File

@ -37,12 +37,12 @@ class CsDhcp(CsDataBag):
self.changed = [] self.changed = []
self.devinfo = CsHelper.get_device_info() self.devinfo = CsHelper.get_device_info()
self.preseed() self.preseed()
self.cloud = CsFile(DHCP_HOSTS) self.dhcp_hosts = CsFile(DHCP_HOSTS)
self.dhcp_opts = CsFile(DHCP_OPTS) self.dhcp_opts = CsFile(DHCP_OPTS)
self.conf = CsFile(CLOUD_CONF) self.conf = CsFile(CLOUD_CONF)
self.dhcp_leases = CsFile(LEASES) self.dhcp_leases = CsFile(LEASES)
self.cloud.repopulate() self.dhcp_hosts.repopulate()
self.dhcp_opts.repopulate() self.dhcp_opts.repopulate()
for item in self.dbag: for item in self.dbag:
@ -54,21 +54,22 @@ class CsDhcp(CsDataBag):
self.configure_server() self.configure_server()
restart_dnsmasq = False restart_dnsmasq = False
need_delete_leases = False
if self.conf.commit(): if self.conf.commit():
restart_dnsmasq = True restart_dnsmasq = True
need_delete_leases = True
if self.cloud.commit(): if self.dhcp_hosts.commit():
restart_dnsmasq = True need_delete_leases = True
if self.dhcp_leases.commit(): if self.dhcp_leases.commit():
restart_dnsmasq = True need_delete_leases = True
self.dhcp_opts.commit() self.dhcp_opts.commit()
if restart_dnsmasq: if need_delete_leases:
self.delete_leases() self.delete_leases()
self.write_hosts() self.write_hosts()
if not self.cl.is_redundant() or self.cl.is_master(): if not self.cl.is_redundant() or self.cl.is_master():
@ -189,20 +190,20 @@ class CsDhcp(CsDataBag):
lease = 'infinite' lease = 'infinite'
if entry['default_entry']: if entry['default_entry']:
self.cloud.add("%s,%s,%s,%s" % (entry['mac_address'], self.dhcp_hosts.add("%s,%s,%s,%s" % (entry['mac_address'],
entry['ipv4_address'], entry['ipv4_address'],
entry['host_name'], entry['host_name'],
lease)) lease))
self.dhcp_leases.search(entry['mac_address'], "0 %s %s %s *" % (entry['mac_address'], self.dhcp_leases.search(entry['mac_address'], "0 %s %s %s *" % (entry['mac_address'],
entry['ipv4_address'], entry['ipv4_address'],
entry['host_name'])) entry['host_name']))
else: else:
tag = entry['ipv4_address'].replace(".", "_") tag = entry['ipv4_address'].replace(".", "_")
self.cloud.add("%s,set:%s,%s,%s,%s" % (entry['mac_address'], self.dhcp_hosts.add("%s,set:%s,%s,%s,%s" % (entry['mac_address'],
tag, tag,
entry['ipv4_address'], entry['ipv4_address'],
entry['host_name'], entry['host_name'],
lease)) lease))
self.dhcp_opts.add("%s,%s" % (tag, 3)) self.dhcp_opts.add("%s,%s" % (tag, 3))
self.dhcp_opts.add("%s,%s" % (tag, 6)) self.dhcp_opts.add("%s,%s" % (tag, 6))
self.dhcp_opts.add("%s,%s" % (tag, 15)) self.dhcp_opts.add("%s,%s" % (tag, 15))