openstack
/
fuel-menu
Code Issues Proposed changes

Merge "Revert "Point DHCP gateway to default gateway""

This commit is contained in:
Jenkins 2016-06-14 08:01:14 +00:00 committed by Gerrit Code Review
parent 3a8b5e8c3a d97a72840a
commit 668fb1dcbd
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

@ -511,14 +511,8 @@ interface first.")
elif key == "ADMIN_NETWORK/dhcp_pool_end": elif key == "ADMIN_NETWORK/dhcp_pool_end":
self.edits[index].set_edit_text(dynamic_end) self.edits[index].set_edit_text(dynamic_end)
elif key == "ADMIN_NETWORK/dhcp_gateway": elif key == "ADMIN_NETWORK/dhcp_gateway":
gw = self.get_default_gateway_linux() self.edits[index].set_edit_text(self.netsettings[
if network.inSameSubnet( self.activeiface]['addr'])
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): def refresh(self):
self.getNetwork() self.getNetwork()