Commit 9b65e0d4 authored by Iustin Pop's avatar Iustin Pop
Browse files

Revert the instance IP conflicts



Since instances can live in different VLANs from nodes (especially in
routed mode), based on the 'link' parameter, we shouldn't always
restrict having duplicate IPs. Thus we only check the node IPs/cluster
IP for now.
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent 2d5095d7
......@@ -408,10 +408,6 @@ class ConfigWriter:
_helper(node.primary_ip, "node:%s/primary" % node.name)
if node.secondary_ip != node.primary_ip:
_helper(node.secondary_ip, "node:%s/secondary" % node.name)
for instance in data.instances.values():
for idx, nic in enumerate(instance.nics):
if nic.ip is not None:
_helper(nic.ip, "instance:%s/nic:%d" % (instance.name, idx))
for ip, owners in ips.items():
if len(owners) > 1:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment