From d97a72840a987bcbce8551a766aed8f3d7e9e032 Mon Sep 17 00:00:00 2001 From: Maksim Malchuk Date: Fri, 10 Jun 2016 19:15:58 +0000 Subject: [PATCH] Revert "Point DHCP gateway to default gateway" This reverts commit af10eca2e7b6993033fb8d3c077ae9f0885ef93d. Because it breaks the default routing for routerless configurations like VirtualBox for example. By default Fuel master-node always acts as a router (https://github.com/openstack/fuel-library/blob/master/ deployment/puppet/fuel/examples/host.pp#L145-L146). Change-Id: I2028f28a21d41cc34980a6a6d94331b1ffe5c8e0 Closes-Bug: #1591322 --- fuelmenu/modules/cobblerconf.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/fuelmenu/modules/cobblerconf.py b/fuelmenu/modules/cobblerconf.py index 0b84e88..7528fd0 100644 --- a/fuelmenu/modules/cobblerconf.py +++ b/fuelmenu/modules/cobblerconf.py @@ -401,14 +401,8 @@ interface first.") elif key == "ADMIN_NETWORK/dhcp_pool_end": self.edits[index].set_edit_text(dynamic_end) elif key == "ADMIN_NETWORK/dhcp_gateway": - 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) + self.edits[index].set_edit_text(self.netsettings[ + self.activeiface]['addr']) def refresh(self): self.getNetwork()