You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2017/03/22 21:42:59 UTC
[1/2] ambari git commit: Revert "AMBARI-20509. Incorrect webhbase
host and port for Knox Topology (Sandeep More via smohanty)"
Repository: ambari
Updated Branches:
refs/heads/trunk 936d8591e -> 4a9dee610
Revert "AMBARI-20509. Incorrect webhbase host and port for Knox Topology (Sandeep More via smohanty)"
This reverts commit 50d684a95f1ee107d9a6bc1772750ea74fee39bb.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8fc7db16
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8fc7db16
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8fc7db16
Branch: refs/heads/trunk
Commit: 8fc7db16bb825242200e51008dfb02af7be1959c
Parents: 936d859
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Wed Mar 22 14:41:35 2017 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Wed Mar 22 14:41:35 2017 -0700
----------------------------------------------------------------------
.../stacks/HDP/2.6/services/KNOX/configuration/topology.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8fc7db16/ambari-server/src/main/resources/stacks/HDP/2.6/services/KNOX/configuration/topology.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/KNOX/configuration/topology.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/services/KNOX/configuration/topology.xml
index f27aac7..df4c1b4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/KNOX/configuration/topology.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/KNOX/configuration/topology.xml
@@ -100,7 +100,7 @@
<service>
<role>WEBHBASE</role>
- <url>http://{{hbase_rest_server}}:{{hbase_rest_port}}</url>
+ <url>http://{{hbase_master_host}}:{{hbase_master_port}}</url>
</service>
<service>
[2/2] ambari git commit: Revert "AMBARI-20263. Knox default topology
config is wrong for Hbase service (Sandeep More via smohanty)"
Posted by sm...@apache.org.
Revert "AMBARI-20263. Knox default topology config is wrong for Hbase service (Sandeep More via smohanty)"
This reverts commit 7e624b55ccac6c04fa9caf5eddbb4aa9282fd473.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4a9dee61
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4a9dee61
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4a9dee61
Branch: refs/heads/trunk
Commit: 4a9dee6102d2989bf0e023c5d5c2c5b1b2d56958
Parents: 8fc7db1
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Wed Mar 22 14:41:57 2017 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Wed Mar 22 14:41:57 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/4a9dee61/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 @@
<service>
<role>WEBHBASE</role>
- <url>http://{{hbase_rest_server}}:{{hbase_rest_port}}</url>
+ <url>http://{{hbase_master_host}}:{{hbase_master_port}}</url>
</service>
<service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4a9dee61/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 1224a9f..8beb2c0 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
@@ -211,18 +211,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]