Skip to content

Commit 513b680

Browse files
sudisonsudison
committed
CLOUDSTACK-316: if public network is not specified, set to guest network
1 parent e73cbfe commit 513b680

1 file changed

Lines changed: 23 additions & 13 deletions

File tree

‎server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java‎

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,9 @@ public Map<? extends ServerResource, Map<String, String>> find(long dcId,
176176
}
177177

178178
List <PhysicalNetworkSetupInfo> netInfos = _networkMgr.getPhysicalNetworkInfo(dcId, HypervisorType.KVM);
179-
String kvmPrivateNic = _kvmPrivateNic;
180-
String kvmPublicNic = _kvmPublicNic;
181-
String kvmGuestNic = _kvmGuestNic;
179+
String kvmPrivateNic = null;
180+
String kvmPublicNic = null;
181+
String kvmGuestNic = null;
182182

183183
for (PhysicalNetworkSetupInfo info : netInfos) {
184184
if (info.getPrivateNetworkName() != null) {
@@ -191,21 +191,31 @@ public Map<? extends ServerResource, Map<String, String>> find(long dcId,
191191
kvmGuestNic = info.getGuestNetworkName();
192192
}
193193
}
194-
195-
String parameters = " -m " + _hostIp + " -z " + dcId + " -p " + podId + " -c " + clusterId + " -g " + guid + " -a";
196194

197-
if (kvmPublicNic != null) {
198-
parameters += " --pubNic=" + kvmPublicNic;
199-
}
195+
if (kvmPrivateNic == null && kvmPublicNic == null && kvmGuestNic == null) {
196+
kvmPrivateNic = _kvmPrivateNic;
197+
kvmPublicNic = _kvmPublicNic;
198+
kvmGuestNic = _kvmGuestNic;
199+
}
200200

201-
if (kvmPrivateNic != null) {
202-
parameters += " --prvNic=" + kvmPrivateNic;
201+
if (kvmPublicNic == null) {
202+
kvmPublicNic = (kvmGuestNic != null) ? kvmGuestNic : kvmPrivateNic;
203+
}
204+
205+
if (kvmPrivateNic == null) {
206+
kvmPrivateNic = (kvmPublicNic != null) ? kvmPublicNic : kvmGuestNic;
203207
}
204208

205-
if (kvmGuestNic != null) {
206-
parameters += " --guestNic=" + kvmGuestNic;
209+
if (kvmGuestNic == null) {
210+
kvmGuestNic = (kvmPublicNic != null) ? kvmPublicNic : kvmPrivateNic;
207211
}
208-
212+
213+
String parameters = " -m " + _hostIp + " -z " + dcId + " -p " + podId + " -c " + clusterId + " -g " + guid + " -a";
214+
215+
parameters += " --pubNic=" + kvmPublicNic;
216+
parameters += " --prvNic=" + kvmPrivateNic;
217+
parameters += " --guestNic=" + kvmGuestNic;
218+
209219
SSHCmdHelper.sshExecuteCmd(sshConnection, "cloud-setup-agent " + parameters, 3);
210220

211221
KvmDummyResourceBase kvmResource = new KvmDummyResourceBase();

0 commit comments

Comments
 (0)