You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/10/28 19:21:45 UTC
[1/2] git commit: updated refs/heads/master to da9063e
Repository: cloudstack
Updated Branches:
refs/heads/master 88dd3009d -> da9063e7d
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 <ro...@shapeblue.com>
(cherry picked from commit 536a8b22c8865dc94281bce6267930a63e03ab77)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1e8d39b1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1e8d39b1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1e8d39b1
Branch: refs/heads/master
Commit: 1e8d39b12e1ade404eb002269b54e518d6aa3309
Parents: 535ab51
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Oct 28 10:52:13 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Oct 28 10:56:36 2015 +0530
----------------------------------------------------------------------
python/lib/cloudutils/serviceConfig.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e8d39b1/python/lib/cloudutils/serviceConfig.py
----------------------------------------------------------------------
diff --git a/python/lib/cloudutils/serviceConfig.py b/python/lib/cloudutils/serviceConfig.py
index b1bdfbb..774195a 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")
[2/2] git commit: updated refs/heads/master to da9063e
Posted by re...@apache.org.
Merge pull request #991 from shapeblue/allow-pluggable-kvmresource-master
[master/4.6] CLOUDSTACK-8999: Don't override resource if provided by agent.propertiesIf 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
A simple if-else fix, cc @remibergsma @wido @wilderrodrigues @borisroman and others
* pr/991:
CLOUDSTACK-8999: Don't override resource if provided by agent.properties
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/da9063e7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/da9063e7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/da9063e7
Branch: refs/heads/master
Commit: da9063e7dfdd592788f5ee23ff1258b4bb7eee0b
Parents: 88dd300 1e8d39b
Author: Remi Bergsma <gi...@remi.nl>
Authored: Wed Oct 28 19:20:39 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Wed Oct 28 19:20:47 2015 +0100
----------------------------------------------------------------------
python/lib/cloudutils/serviceConfig.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------