Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-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 AC41718E42 for ; Thu, 18 Feb 2016 18:55:56 +0000 (UTC) Received: (qmail 76567 invoked by uid 500); 18 Feb 2016 18:55:53 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 76537 invoked by uid 500); 18 Feb 2016 18:55:53 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 76528 invoked by uid 99); 18 Feb 2016 18:55:53 -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; Thu, 18 Feb 2016 18:55:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 24856DFF67; Thu, 18 Feb 2016 18:55:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jaoki@apache.org To: commits@ambari.apache.org Message-Id: <680b467342cd44ec8ff01c439797ae27@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-15082: HAWQ fails to install (mithmatt via jaoki) Date: Thu, 18 Feb 2016 18:55:53 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/trunk 1d7af0ebd -> 7da4706a3 AMBARI-15082: HAWQ fails to install (mithmatt via jaoki) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7da4706a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7da4706a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7da4706a Branch: refs/heads/trunk Commit: 7da4706a33a03ce38739b5d5f0c11c4b2fc4bb94 Parents: 1d7af0e Author: Jun Aoki Authored: Thu Feb 18 10:55:42 2016 -0800 Committer: Jun Aoki Committed: Thu Feb 18 10:55:42 2016 -0800 ---------------------------------------------------------------------- .../common-services/HAWQ/2.0.0/package/scripts/common.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7da4706a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py index b5353e8..00349d8 100644 --- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py +++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py @@ -67,18 +67,15 @@ def setup_common_configurations(): """ import params - # Write hdfs-client.xml on the local filesystem. If hdfs HA is enabled, append related parameters - params.XmlConfig(filename="hdfs-client.xml", + params.XmlConfig("hdfs-client.xml", configurations=params.hdfs_client, configuration_attributes=params.config_attrs['hdfs-client']) - # Write yarn-client.xml on the local filesystem. If yarn HA is enabled, append related parameters - params.XmlConfig(filename="yarn-client.xml", + params.XmlConfig("yarn-client.xml", configurations=params.yarn_client, configuration_attributes=params.config_attrs['yarn-client']) - # Write hawq-site.xml on the local filesystem. - params.XmlConfig(filename="hawq-site.xml", + params.XmlConfig("hawq-site.xml", configurations=params.hawq_site, configuration_attributes=params.config_attrs['hawq-site']) __set_osparams()