openstack
/
fuel-menu
Code Issues Proposed changes

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
This commit is contained in:
Mykola Yakovliev 2016-04-20 16:23:27 +03:00
parent cc4628c865
commit af10eca2e7
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fuelmenu/modules/cobblerconf.py
View File

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