This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.11
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.11 by this push:
new 33a6ea0 router: Use network based netmask for dnsmasq (#2792)
33a6ea0 is described below
commit 33a6ea0c8788d5daf559eb817eacd18c0e863679
Author: Rene Diepstraten <rene@diepstraten.online>
AuthorDate: Tue Aug 7 11:59:38 2018 +0200
router: Use network based netmask for dnsmasq (#2792)
Without this patch, the VR uses the netmask of the primary network for all
assigned cidrs.
This patch correctly applies the corresponding netmask.
---
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py
b/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py
index 30fb38e..ecbc12f 100755
--- a/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py
+++ b/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py
@@ -107,7 +107,7 @@ class CsDhcp(CsDataBag):
if self.config.is_vpc():
netmask = gn.get_netmask()
else:
- netmask = self.config.address().get_guest_netmask()
+ netmask = str(i['network'].netmask)
sline = "dhcp-option=tag:interface-%s-%s,1," % (device, idx)
line = "dhcp-option=tag:interface-%s-%s,1,%s" % (device, idx,
netmask)
self.conf.search(sline, line)
