Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6A830200CF7 for ; Tue, 19 Sep 2017 08:47:16 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 68F001609DD; Tue, 19 Sep 2017 06:47:16 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 86E391609DB for ; Tue, 19 Sep 2017 08:47:15 +0200 (CEST) Received: (qmail 8794 invoked by uid 500); 19 Sep 2017 06:47:14 -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 8785 invoked by uid 99); 19 Sep 2017 06:47:14 -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; Tue, 19 Sep 2017 06:47:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1299EF57F8; Tue, 19 Sep 2017 06:47:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mugdha@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-21925 : Facilitate a parameter to provide HBase conf directory for atlas-env configurations. (Vishal Suvagia via mugdha) Date: Tue, 19 Sep 2017 06:47:14 +0000 (UTC) archived-at: Tue, 19 Sep 2017 06:47:16 -0000 Repository: ambari Updated Branches: refs/heads/trunk 26965b3eb -> 1f321e356 AMBARI-21925 : Facilitate a parameter to provide HBase conf directory for atlas-env configurations. (Vishal Suvagia via mugdha) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1f321e35 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1f321e35 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1f321e35 Branch: refs/heads/trunk Commit: 1f321e35693a1c8fe2c6c5a4ac3e1f454bf847e1 Parents: 26965b3 Author: Vishal Suvagia Authored: Tue Sep 19 12:06:03 2017 +0530 Committer: Mugdha Varadkar Committed: Tue Sep 19 12:16:16 2017 +0530 ---------------------------------------------------------------------- .../common-services/ATLAS/0.1.0.2.3/package/scripts/params.py | 2 +- .../ATLAS/0.7.0.3.0/configuration/atlas-env.xml | 6 ++++++ .../common-services/ATLAS/0.7.0.3.0/package/scripts/params.py | 2 +- .../stacks/HDP/2.6/services/ATLAS/configuration/atlas-env.xml | 6 ++++++ .../main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml | 4 ++++ .../stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 4 ++++ .../src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 1 + 7 files changed, 23 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1f321e35/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py index 96041e6..968ceed 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py @@ -205,7 +205,7 @@ smokeuser_keytab = config['configurations']['cluster-env']['smokeuser_keytab'] security_check_status_file = format('{log_dir}/security_check.status') # hbase -hbase_conf_dir = "/etc/hbase/conf" +hbase_conf_dir = default('configurations/atlas-env/atlas.hbase.conf.dir','/etc/hbase/conf') atlas_search_backend = default("/configurations/application-properties/atlas.graph.index.search.backend", "") search_backend_solr = atlas_search_backend.startswith('solr') http://git-wip-us.apache.org/repos/asf/ambari/blob/1f321e35/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/configuration/atlas-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/configuration/atlas-env.xml b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/configuration/atlas-env.xml index f97ca98..ee8aedd 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/configuration/atlas-env.xml +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/configuration/atlas-env.xml @@ -185,4 +185,10 @@ Replication factor for the atlas solr collections. + + atlas.hbase.conf.dir + /etc/hbase/conf + Configurable HBase conf directory. + + http://git-wip-us.apache.org/repos/asf/ambari/blob/1f321e35/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/params.py index 61b41d6..b01884c 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/params.py @@ -202,7 +202,7 @@ smokeuser_keytab = config['configurations']['cluster-env']['smokeuser_keytab'] security_check_status_file = format('{log_dir}/security_check.status') # hbase -hbase_conf_dir = "/etc/hbase/conf" +hbase_conf_dir = default('configurations/atlas-env/atlas.hbase.conf.dir','/etc/hbase/conf') atlas_search_backend = default("/configurations/application-properties/atlas.graph.index.search.backend", "") search_backend_solr = atlas_search_backend.startswith('solr') http://git-wip-us.apache.org/repos/asf/ambari/blob/1f321e35/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/atlas-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/atlas-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/atlas-env.xml index 821fafa..b69bccd 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/atlas-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/atlas-env.xml @@ -44,4 +44,10 @@ Replication factor for the atlas solr collections. + + atlas.hbase.conf.dir + /etc/hbase/conf + Configurable HBase conf directory. + + http://git-wip-us.apache.org/repos/asf/ambari/blob/1f321e35/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml index 83fde06..2b4c656 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml @@ -202,6 +202,10 @@ + + atlas-env + + http://git-wip-us.apache.org/repos/asf/ambari/blob/1f321e35/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml index bee7b98..bce1e86 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml @@ -372,6 +372,10 @@ + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/1f321e35/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml index f7baf81..d5f2324 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml @@ -1041,6 +1041,7 @@ +