Merge pull request cobbler#1639 from davidkostal/dhcp-over-tagged-vlan

Added support for fixed DHCP IPs when using vlan over bond.
jimi-c · Apr 17, 2016 · 8e972ca · 8e972ca
2 parents 03ea444 + 731696b
commit 8e972ca
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/cobbler/modules/manage_isc.py b/cobbler/modules/manage_isc.py
@@ -106,6 +106,14 @@ def write_dhcp_file(self):
                         # exist
                         continue
                     ip = system.interfaces[interface["interface_master"]]["ip_address"]
+                    if ip is None or ip == "":
+                        for (nam2, int2) in system.interfaces.iteritems():
+                            if (nam2.startswith(interface["interface_master"] + ".")
+                                and int2["ip_address"] is not None
+                                and int2["ip_address"] != ""):
+                                    ip = int2["ip_address"]
+                                    break
+
                     interface["ip_address"] = ip
                     host = system.interfaces[interface["interface_master"]]["dns_name"]
                     interface["if_gateway"] = system.interfaces[interface["interface_master"]]["if_gateway"]