You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/08/19 18:13:05 UTC

git commit: updated refs/heads/4.5 to 74f697a

Repository: cloudstack
Updated Branches:
  refs/heads/4.5 1a106ec16 -> 74f697a2d


CLOUDSTACK-8749: KVM - cleanup linklocal interface based on names

This tries to avoid cleaning by a device name.

Signed-off-by: Rohit Yadav <ro...@shapeblue.com>

This closes #718


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/74f697a2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/74f697a2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/74f697a2

Branch: refs/heads/4.5
Commit: 74f697a2dd6e2630fa1fa5949e41c7d539015fbf
Parents: 1a106ec
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Aug 19 15:38:31 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Aug 19 21:42:47 2015 +0530

----------------------------------------------------------------------
 .../kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/74f697a2/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
index aaf75ff..dbc079d 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
@@ -287,7 +287,7 @@ public class BridgeVifDriver extends VifDriverBase {
             for (String line : lines) {
                 String[] tokens = line.split(" ");
                 if (!tokens[2].equalsIgnoreCase(linkLocalBr)) {
-                    Script.runSimpleBashScript("ip route del " + NetUtils.getLinkLocalCIDR());
+                    Script.runSimpleBashScript("ip route del " + NetUtils.getLinkLocalCIDR() + " dev " + tokens[2]);
                 } else {
                     foundLinkLocalBr = true;
                 }