Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5B6EA182D3 for ; Wed, 28 Oct 2015 18:21:46 +0000 (UTC) Received: (qmail 8357 invoked by uid 500); 28 Oct 2015 18:21:46 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 8324 invoked by uid 500); 28 Oct 2015 18:21:46 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 8309 invoked by uid 99); 28 Oct 2015 18:21:46 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Oct 2015 18:21:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0AE9CDFCCE; Wed, 28 Oct 2015 18:21:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: remi@apache.org To: commits@cloudstack.apache.org Date: Wed, 28 Oct 2015 18:21:45 -0000 Message-Id: <38ab29f31a2c4608a35a2728322b9207@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 (cherry picked from commit 536a8b22c8865dc94281bce6267930a63e03ab77) Signed-off-by: Rohit Yadav 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 Authored: Wed Oct 28 10:52:13 2015 +0530 Committer: Rohit Yadav 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")