ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smoha...@apache.org
Subject ambari git commit: Revert "AMBARI-20263. Knox default topology config is wrong for Hbase service (Sandeep More via smohanty)"
Date Thu, 13 Apr 2017 00:17:28 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 0d3d23276 -> 0140f7ad9


Revert "AMBARI-20263. Knox default topology config is wrong for Hbase service (Sandeep More
via smohanty)"

This reverts commit d547d5dcc16c7824cbfe5afd9e33dc4913415d77.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0140f7ad
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0140f7ad
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0140f7ad

Branch: refs/heads/branch-2.5
Commit: 0140f7ad9666c425022023b13d7abc9d0ba2043a
Parents: 0d3d232
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Wed Apr 12 17:17:11 2017 -0700
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Wed Apr 12 17:17:11 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, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0140f7ad/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 bf0ab8f..3e56c3d 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 @@
 
             &lt;service&gt;
                 &lt;role&gt;WEBHBASE&lt;/role&gt;
-                &lt;url&gt;http://{{hbase_rest_server}}:{{hbase_rest_port}}&lt;/url&gt;
+                &lt;url&gt;http://{{hbase_master_host}}:{{hbase_master_port}}&lt;/url&gt;
             &lt;/service&gt;
 
             &lt;service&gt;

http://git-wip-us.apache.org/repos/asf/ambari/blob/0140f7ad/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 3fb6af9..5a2ef19 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,18 +212,13 @@ 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]


Mime
View raw message