apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-316: if public network is not specified, set to guest network

Browse Source
This commit is contained in:
Edison Su 2012-10-11 16:19:53 -07:00
parent e73cbfe6a9
commit 513b680d96
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java
View File

@ -176,9 +176,9 @@ public class KvmServerDiscoverer extends DiscovererBase implements Discoverer,
} }
List <PhysicalNetworkSetupInfo> netInfos = _networkMgr.getPhysicalNetworkInfo(dcId, HypervisorType.KVM); List <PhysicalNetworkSetupInfo> netInfos = _networkMgr.getPhysicalNetworkInfo(dcId, HypervisorType.KVM);
String kvmPrivateNic = _kvmPrivateNic; String kvmPrivateNic = null;
String kvmPublicNic = _kvmPublicNic; String kvmPublicNic = null;
String kvmGuestNic = _kvmGuestNic; String kvmGuestNic = null;
for (PhysicalNetworkSetupInfo info : netInfos) { for (PhysicalNetworkSetupInfo info : netInfos) {
if (info.getPrivateNetworkName() != null) { if (info.getPrivateNetworkName() != null) {
@ -191,21 +191,31 @@ public class KvmServerDiscoverer extends DiscovererBase implements Discoverer,
kvmGuestNic = info.getGuestNetworkName(); kvmGuestNic = info.getGuestNetworkName();
} }
} }
if (kvmPrivateNic == null && kvmPublicNic == null && kvmGuestNic == null) {
kvmPrivateNic = _kvmPrivateNic;
kvmPublicNic = _kvmPublicNic;
kvmGuestNic = _kvmGuestNic;
}
if (kvmPublicNic == null) {
kvmPublicNic = (kvmGuestNic != null) ? kvmGuestNic : kvmPrivateNic;
}
if (kvmPrivateNic == null) {
kvmPrivateNic = (kvmPublicNic != null) ? kvmPublicNic : kvmGuestNic;
}
if (kvmGuestNic == null) {
kvmGuestNic = (kvmPublicNic != null) ? kvmPublicNic : kvmPrivateNic;
}
String parameters = " -m " + _hostIp + " -z " + dcId + " -p " + podId + " -c " + clusterId + " -g " + guid + " -a";
parameters += " --pubNic=" + kvmPublicNic;
parameters += " --prvNic=" + kvmPrivateNic;
parameters += " --guestNic=" + kvmGuestNic;
String parameters = " -m " + _hostIp + " -z " + dcId + " -p " + podId + " -c " + clusterId + " -g " + guid + " -a";
if (kvmPublicNic != null) {
parameters += " --pubNic=" + kvmPublicNic;
}
if (kvmPrivateNic != null) {
parameters += " --prvNic=" + kvmPrivateNic;
}
if (kvmGuestNic != null) {
parameters += " --guestNic=" + kvmGuestNic;
}
SSHCmdHelper.sshExecuteCmd(sshConnection, "cloud-setup-agent " + parameters, 3); SSHCmdHelper.sshExecuteCmd(sshConnection, "cloud-setup-agent " + parameters, 3);
KvmDummyResourceBase kvmResource = new KvmDummyResourceBase(); KvmDummyResourceBase kvmResource = new KvmDummyResourceBase();