Updated Branches: refs/heads/master 2dbcfa96b -> 2ce632cf0
agent: Set default values for all variables Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9fe61103 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9fe61103 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9fe61103 Branch: refs/heads/master Commit: 9fe611037f1cfec7c7819e4eac0f8535ee7fed60 Parents: c4f8475 Author: Wido den Hollander <[email protected]> Authored: Wed Aug 8 20:48:43 2012 +0200 Committer: Wido den Hollander <[email protected]> Committed: Wed Aug 8 22:31:06 2012 +0200 ---------------------------------------------------------------------- .../kvm/resource/LibvirtComputingResource.java | 24 +++++++++++---- 1 files changed, 18 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9fe61103/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index dea00bd..ab8a34d 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -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; }
