From af10eca2e7b6993033fb8d3c077ae9f0885ef93d Mon Sep 17 00:00:00 2001 From: Mykola Yakovliev Date: Wed, 20 Apr 2016 16:23:27 +0300 Subject: [PATCH] Point DHCP gateway to default gateway Set up correct default DHCP gateway to exist router, not to non-routable Fuel master node. Change-Id: I3ac680d32be8b69f4554aae3c9b85e9f90825e35 Closes-Bug: #1516390 --- fuelmenu/modules/cobblerconf.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/fuelmenu/modules/cobblerconf.py b/fuelmenu/modules/cobblerconf.py index 7528fd0..0b84e88 100644 --- a/fuelmenu/modules/cobblerconf.py +++ b/fuelmenu/modules/cobblerconf.py @@ -401,8 +401,14 @@ interface first.") elif key == "ADMIN_NETWORK/dhcp_pool_end": self.edits[index].set_edit_text(dynamic_end) elif key == "ADMIN_NETWORK/dhcp_gateway": - self.edits[index].set_edit_text(self.netsettings[ - self.activeiface]['addr']) + gw = self.get_default_gateway_linux() + if network.inSameSubnet( + gw, dynamic_start, + self.netsettings[self.activeiface]['netmask']): + dhcp_gateway = gw + else: + dhcp_gateway = self.netsettings[self.activeiface]['addr'] + self.edits[index].set_edit_text(dhcp_gateway) def refresh(self): self.getNetwork()