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

agent: Set default values for all variables

Browse Source
This commit is contained in:
Wido den Hollander 2012-08-08 20:48:43 +02:00
parent c4f847518f
commit 9fe611037f
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
View File

@ -412,6 +412,14 @@ public class LibvirtComputingResource extends ServerResourceBase implements
return "scripts/storage/qcow2";
}
protected String getDefaultKvmScriptsDir() {
return "scripts/vm/hypervisor/kvm";
}
protected String getDefaultDomrScriptsDir() {
return "scripts/network/domr/kvm";
}
@Override
public boolean configure(String name, Map<String, Object> params)
throws ConfigurationException {
@ -430,16 +438,15 @@ public class LibvirtComputingResource extends ServerResourceBase implements
+ "com.cloud.storage.JavaStorageLayer");
}
_virtRouterResource = new VirtualRoutingResource();
// Set the domr scripts directory
params.put("domr.scripts.dir", "scripts/network/domr/kvm");
success = _virtRouterResource.configure(name, params);
String domrScriptsDir = (String) params.get("domr.scripts.dir");
if (domrScriptsDir == null) {
domrScriptsDir = getDefaultDomrScriptsDir();
}
String kvmScriptsDir = (String) params.get("kvm.scripts.dir");
if (kvmScriptsDir == null) {
kvmScriptsDir = "scripts/vm/hypervisor/kvm";
kvmScriptsDir = getDefaultKvmScriptsDir();
}
String networkScriptsDir = (String) params.get("network.scripts.dir");
@ -452,6 +459,11 @@ public class LibvirtComputingResource extends ServerResourceBase implements
storageScriptsDir = getDefaultStorageScriptsDir();
}
params.put("domr.scripts.dir", domrScriptsDir);
_virtRouterResource = new VirtualRoutingResource();
success = _virtRouterResource.configure(name, params);
if (!success) {
return false;
}