From 1e8d39b12e1ade404eb002269b54e518d6aa3309 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Wed, 28 Oct 2015 10:52:13 +0530 Subject: [PATCH] CLOUDSTACK-8999: Don't override resource if provided by agent.properties If a custom resource (kvm/libvirt implementation) is defined in agent.properties don't override with the default, but check and fallback to the default if resource property not defined Signed-off-by: Rohit Yadav (cherry picked from commit 536a8b22c8865dc94281bce6267930a63e03ab77) Signed-off-by: Rohit Yadav --- python/lib/cloudutils/serviceConfig.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python/lib/cloudutils/serviceConfig.py b/python/lib/cloudutils/serviceConfig.py index b1bdfbb88f5..774195ae0fa 100755 --- a/python/lib/cloudutils/serviceConfig.py +++ b/python/lib/cloudutils/serviceConfig.py @@ -678,7 +678,8 @@ class cloudAgentConfig(serviceCfgBase): cfo.addEntry("guid", str(self.syscfg.env.uuid)) if cfo.getEntry("local.storage.uuid") == "": cfo.addEntry("local.storage.uuid", str(bash("uuidgen").getStdout())) - cfo.addEntry("resource", "com.cloud.hypervisor.kvm.resource.LibvirtComputingResource") + if cfo.getEntry("resource") == "": + cfo.addEntry("resource", "com.cloud.hypervisor.kvm.resource.LibvirtComputingResource") cfo.save() self.syscfg.svo.stopService("cloudstack-agent")