From 7d0d04946b25ab692228afd0fa3837e88742988d Mon Sep 17 00:00:00 2001
From: Edison Su <sudison@gmail.com>
Date: Mon, 20 Aug 2012 10:42:12 -0700
Subject: [PATCH] Revert "recreate router if failed"

This reverts commit 0f4ffd88976437bbc3485911b186f4f52fb2d8a0.

Conflicts:

	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
---
 server/src/com/cloud/vm/VirtualMachineManagerImpl.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index bd5de5b5163..efce9718421 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -742,6 +742,12 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
                     if (vm.getHypervisorType() != HypervisorType.BareMetal) {
                         _storageMgr.prepare(vmProfile, dest);
                     }                    
+
+                    //since StorageMgr succeeded in volume creation, resue Volume for further tries until current cluster has capacity
+                    if(!reuseVolume){
+                        reuseVolume = true;
+                    }
+
                     vmGuru.finalizeVirtualMachineProfile(vmProfile, dest, ctx);
 
                     VirtualMachineTO vmTO = hvGuru.implement(vmProfile);