openstack
/
fuel-web
Code Issues Proposed changes

Add arping bind for duplicate IP check on PXE setup 

This was done already for interface configuration,
but was missed previously in commit
6410677ada

Corrected iteritems to itervalues for assigned_ips.

Change-Id: Ia68997db203a1ae7c888ee311ab239740526e8f1
Closes-Bug: #1463418
This commit is contained in:
Matthew Mosesohn 2015-09-24 16:24:50 +03:00
parent 83fe01f688
commit 4eb54f6b36
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fuelmenu/fuelmenu/modules/cobblerconf.py
View File

@ -250,7 +250,12 @@ interface first.")
self.parent.footer.set_text("Scanning for duplicate IP address"
"es. Please wait...")
if network.duplicateIPExists(mgmt_if_ipaddr, self.activeiface):
# Bind arping to mgmt_if_ipaddr if it assigned
assigned_ips = [v.get('addr') for v in
self.netsettings.itervalues()]
arping_bind = mgmt_if_ipaddr in assigned_ips
if network.duplicateIPExists(mgmt_if_ipaddr, self.activeiface,
arping_bind):
errors.append("Duplicate host found with IP {0}.".format(
mgmt_if_ipaddr))

4
fuelmenu/fuelmenu/modules/interfaces.py
View File

@ -251,8 +251,8 @@ class interfaces(urwid.WidgetWrap):
"duplicate IP.".format(self.activeiface))
# Bind arping to requested IP if it's already assigned
assigned_ips = [v.get('addr') for _, v in
self.netsettings.iteritems()]
assigned_ips = [v.get('addr') for v in
self.netsettings.itervalues()]
arping_bind = responses["ipaddr"] in assigned_ips
if network.duplicateIPExists(responses["ipaddr"],