From e8c32c7f5b21edda8cb67b2d477cf34e1faeb677 Mon Sep 17 00:00:00 2001 From: Joris van Lieshout Date: Mon, 14 Jul 2014 11:09:41 +0200 Subject: [PATCH] Disable inband management of openvswitch on the link local network. You don't want instances connected to this network to be able to talk to the openvswitch management interface. Signed-off-by: Daan Hoogland --- .../hypervisor/xenserver/resource/CitrixResourceBase.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java index 0f42df3cc18..5881d6809ac 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java @@ -4455,11 +4455,14 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe configs.put("ip_begin", NetUtils.getLinkLocalGateway()); configs.put("ip_end", NetUtils.getLinkLocalIpEnd()); configs.put("netmask", NetUtils.getLinkLocalNetMask()); + configs.put("vswitch-disable-in-band", "true"); rec.otherConfig = configs; linkLocal = Network.create(conn, rec); - } else { linkLocal = networks.iterator().next(); + if (!linkLocal.getOtherConfig(conn).containsKey("vswitch-disable-in-band")) { + linkLocal.addToOtherConfig(conn, "vswitch-disable-in-band", "true"); + } } /* Make sure there is a physical bridge on this network */