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

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

This commit is contained in:
will 2010-10-22 11:31:35 -07:00
parent c8850970ca da58ade720
commit 67750795fa
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/com/cloud/agent/manager/AgentManagerImpl.java
View File

@ -512,6 +512,10 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory {
String url = cmd.getUrl();
String username = cmd.getUsername();
String password = cmd.getPassword();
// this is for standalone option
if( clusterName == null && clusterId == null ) {
clusterName = "Standalone-" + url;
}
return discoverHosts(dcId, podId, clusterId, clusterName, url, username, password);
}
@ -563,10 +567,6 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory {
}
}
if( clusterName == null && clusterId == null ) {
clusterName = "Standalone" + url;
}
if (clusterName != null) {
ClusterVO cluster = new ClusterVO(dcId, podId, clusterName);
try {