Return-Path: X-Original-To: apmail-cloudstack-issues-archive@www.apache.org Delivered-To: apmail-cloudstack-issues-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8BCFF18104 for ; Wed, 28 Oct 2015 05:28:28 +0000 (UTC) Received: (qmail 12991 invoked by uid 500); 28 Oct 2015 05:28:28 -0000 Delivered-To: apmail-cloudstack-issues-archive@cloudstack.apache.org Received: (qmail 12725 invoked by uid 500); 28 Oct 2015 05:28:28 -0000 Mailing-List: contact issues-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 issues@cloudstack.apache.org Received: (qmail 12707 invoked by uid 500); 28 Oct 2015 05:28:28 -0000 Delivered-To: apmail-incubator-cloudstack-issues@incubator.apache.org Received: (qmail 12701 invoked by uid 99); 28 Oct 2015 05:28:28 -0000 Received: from arcas.apache.org (HELO arcas) (140.211.11.28) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Oct 2015 05:28:28 +0000 Received: from arcas.apache.org (localhost [127.0.0.1]) by arcas (Postfix) with ESMTP id CE98E2C1F60 for ; Wed, 28 Oct 2015 05:28:27 +0000 (UTC) Date: Wed, 28 Oct 2015 05:28:27 +0000 (UTC) From: "ASF GitHub Bot (JIRA)" To: cloudstack-issues@incubator.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Commented] (CLOUDSTACK-8999) serviceConfig.py does not take in custom kvm resource MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/CLOUDSTACK-8999?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14977765#comment-14977765 ] ASF GitHub Bot commented on CLOUDSTACK-8999: -------------------------------------------- GitHub user bhaisaab opened a pull request: https://github.com/apache/cloudstack/pull/991 [master/4.6] 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 A simple if-else fix, cc @remibergsma @wido @wilderrodrigues @borisroman and others You can merge this pull request into a Git repository by running: $ git pull https://github.com/shapeblue/cloudstack allow-pluggable-kvmresource-master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cloudstack/pull/991.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #991 ---- commit 1e8d39b12e1ade404eb002269b54e518d6aa3309 Author: Rohit Yadav Date: 2015-10-28T05:22:13Z 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 ---- > serviceConfig.py does not take in custom kvm resource > ----------------------------------------------------- > > Key: CLOUDSTACK-8999 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8999 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the default.) > Components: KVM > Reporter: Rohit Yadav > Assignee: Rohit Yadav > Fix For: 4.5.3, 4.6.0 > > > if an admin defines a custom resources in agent.properties, it is not picked up due to hardcoded "resources" in serviceConfig.py. -- This message was sent by Atlassian JIRA (v6.3.4#6332)