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

add guest network for KVM

This commit is contained in:
Edison Su 2011-03-09 19:03:31 -05:00
parent 7d7dee791a
commit b1a316dd91
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
View File

@ -282,6 +282,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
protected String _privBridgeName;
protected String _linkLocalBridgeName;
protected String _publicBridgeName;
protected String _guestBridgeName;
protected String _privateBridgeIp;
protected String _pool;
protected String _localGateway;
@ -534,6 +535,11 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
_privBridgeName = "cloudbr1";
}
_guestBridgeName = (String)params.get("guest.network.device");
if (_guestBridgeName == null) {
_guestBridgeName = _privBridgeName;
}
_privNwName = (String)params.get("private.network.name");
if (_privNwName == null) {
if (isDeveloper) {
@ -645,8 +651,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
if (_publicBridgeName != null) {
pubPif = Script.runSimpleBashScript("brctl show | grep " + _publicBridgeName + " | awk '{print $4}'");
}
if (_privBridgeName != null) {
privPif = Script.runSimpleBashScript("brctl show | grep " + _privBridgeName + " | awk '{print $4}'");
if (_guestBridgeName != null) {
privPif = Script.runSimpleBashScript("brctl show | grep " + _guestBridgeName + " | awk '{print $4}'");
}
return new Pair<String, String>(privPif, pubPif);
}