Repository: cloudstack Updated Branches: refs/heads/master aacf8ef77 -> e8c32c7f5
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 <d...@onecht.net> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e8c32c7f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e8c32c7f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e8c32c7f Branch: refs/heads/master Commit: e8c32c7f5b21edda8cb67b2d477cf34e1faeb677 Parents: aacf8ef Author: Joris van Lieshout <jvanliesh...@schubergphilis.com> Authored: Mon Jul 14 11:09:41 2014 +0200 Committer: Daan Hoogland <d...@onecht.net> Committed: Tue Jul 15 13:35:02 2014 +0200 ---------------------------------------------------------------------- .../cloud/hypervisor/xenserver/resource/CitrixResourceBase.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e8c32c7f/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java ---------------------------------------------------------------------- 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 0f42df3..5881d68 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 */
