openstack
/
fuel-menu
Code Issues Proposed changes

Revert "Point DHCP gateway to default gateway" 

This reverts commit af10eca2e7.

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
This commit is contained in:
Maksim Malchuk 2016-06-10 19:15:58 +00:00
parent af10eca2e7
commit d97a72840a
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fuelmenu/modules/cobblerconf.py
View File

@ -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()