From f56795d22bbc7cca6fe89512ee8e1f602af9d775 Mon Sep 17 00:00:00 2001
From: Koushik Das <Koushik.Das@citrix.com>
Date: Mon, 25 Jun 2012 15:21:20 +0530
Subject: [PATCH] Fix bug CS-15261. In case IP address is passed to
 deployVirtualMachine API, the default property on NIC was not getting set and
 as a result there was a failure down the line and VM creation was failing.

---
 server/src/com/cloud/vm/UserVmManagerImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 9402c8de2a9..40fac710cd9 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2351,11 +2351,12 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
             
             if (defaultNetworkNumber == 0) {
             	 defaultNetworkNumber++;
-            	 profile.setDefaultNic(true);
                  // if user requested specific ip for default network, add it
                  if (defaultNetworkIp != null) {
                      profile = new NicProfile(defaultNetworkIp);
                  }
+                 
+                 profile.setDefaultNic(true);
             }
 
             networks.add(new Pair<NetworkVO, NicProfile>(network, profile));