Repository: ambari Updated Branches: refs/heads/branch-2.5 db9989d10 -> d547d5dcc
AMBARI-20263. Knox default topology config is wrong for Hbase service (Sandeep More via smohanty) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d547d5dc Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d547d5dc Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d547d5dc Branch: refs/heads/branch-2.5 Commit: d547d5dcc16c7824cbfe5afd9e33dc4913415d77 Parents: db9989d Author: Sumit Mohanty <smoha...@hortonworks.com> Authored: Tue Mar 14 15:37:14 2017 -0700 Committer: Sumit Mohanty <smoha...@hortonworks.com> Committed: Tue Mar 14 15:37:14 2017 -0700 ---------------------------------------------------------------------- .../common-services/KNOX/0.5.0.2.2/configuration/topology.xml | 2 +- .../KNOX/0.5.0.2.2/package/scripts/params_linux.py | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d547d5dc/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml index 3e56c3d..bf0ab8f 100644 --- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml +++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml @@ -100,7 +100,7 @@ <service> <role>WEBHBASE</role> - <url>http://{{hbase_master_host}}:{{hbase_master_port}}</url> + <url>http://{{hbase_rest_server}}:{{hbase_rest_port}}</url> </service> <service> http://git-wip-us.apache.org/repos/asf/ambari/blob/d547d5dc/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py index ce87d1c..f461f41 100644 --- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py @@ -212,13 +212,18 @@ if type(webhcat_server_hosts) is list: else: webhcat_server_host = webhcat_server_hosts -hbase_master_port = default('/configurations/hbase-site/hbase.rest.port', "8080") hbase_master_hosts = default("/clusterHostInfo/hbase_master_hosts", None) if type(hbase_master_hosts) is list: hbase_master_host = hbase_master_hosts[0] else: hbase_master_host = hbase_master_hosts +hbase_rest_port = default('/configurations/hbase-site/hbase.rest.port', "60080") +hbase_rest_server = default('/configurations/hbase-site/hbase.rest.server.host', None) + +if hbase_rest_server is None: + hbase_rest_server = hbase_master_host + oozie_server_hosts = default("/clusterHostInfo/oozie_server", None) if type(oozie_server_hosts) is list: oozie_server_host = oozie_server_hosts[0]
