etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0.3' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.3 

reviewed-by: deepti
This commit is contained in:
Deepti Dohare 2012-07-06 16:46:32 +05:30
parent da2f5b83c5 751304b263
commit 9ad450e0f7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -2346,11 +2346,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));