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

KVM fix

This commit is contained in:
anthony 2012-07-24 15:39:46 -07:00
parent d202a491b6
commit c904cfcd05
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
View File

@ -519,7 +519,7 @@ public class VirtualRoutingResource implements Manager {
}
protected String getDomRVersion(String routerIP) {
return routerProxy("getDomRVersion.sh", routerIP, null);
return routerProxy("get_template_version.sh", routerIP, null);
}
protected Answer execute(GetDomRVersionCmd cmd) {
@ -632,21 +632,6 @@ public class VirtualRoutingResource implements Manager {
}
public String assignPublicIpAddress(final String vmName, final long id, final String vnet, final String privateIpAddress, final String macAddress, final String publicIpAddress) {
String args ="-A";
args += " -f"; //first ip is source nat ip
args += " -r ";
args += vmName;
args += " -i ";
args += privateIpAddress;
args += " -a ";
args += macAddress;
args += " -l ";
args += publicIpAddress;
return routerProxy("ipassoc.sh", privateIpAddress, args);
}
public String assignPublicIpAddress(final String vmName,
final String privateIpAddress, final String publicIpAddress,
final boolean add, final boolean firstIP, final boolean sourceNat,