From 843e14085807cd4e54246093f73b923e757f722d Mon Sep 17 00:00:00 2001 From: marcus Date: Mon, 29 Oct 2012 23:13:26 -0600 Subject: [PATCH] Summary: Allow public and private nic to be the same bridge Detail: There was a regression in functionality introduced by 915babd970a9b4f209deceb3c4973b7d1c9c0c12 where the public bridge could not also be the private bridge. This had several additional consequences, this patch should revert the behavior back while keeping the functionality enhancements introduced by that commit. BUG-ID : NONE Reviewed-by: Dave Cahill Reported-by: Dave Cahill via cloudstack-dev Signed-off-by: Marcus Sorensen 1351574006 -0600 --- .../hypervisor/kvm/resource/LibvirtComputingResource.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index be22c505fa6..c783daa5947 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -788,7 +788,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements String pif = getPif(bridge); if(_publicBridgeName != null && bridge.equals(_publicBridgeName)){ _pifs.put("public", pif); - } else if (_guestBridgeName != null) { + } + if (_guestBridgeName != null && bridge.equals(_guestBridgeName)) { _pifs.put("private", pif); } _pifs.put(bridge, pif);