ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gna...@apache.org
Subject ambari git commit: AMBARI-20888. wrong ZK parent node (hbase-unsecure) getting configured as part of the jdbc(phoenix) URL on ubuntu secured cluster. (Prabhjyot Singh via gauravn7)
Date Wed, 03 May 2017 06:18:46 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 42c73f02e -> aa34023e5


AMBARI-20888. wrong ZK parent node (hbase-unsecure) getting configured as part of the jdbc(phoenix)
URL on ubuntu secured cluster. (Prabhjyot Singh via gauravn7)


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

Branch: refs/heads/branch-2.5
Commit: aa34023e5490e9dc77b6f7a646dc635bbf5c8fb1
Parents: 42c73f0
Author: Gaurav Nagar <grvngr@gmail.com>
Authored: Wed May 3 11:48:31 2017 +0530
Committer: Gaurav Nagar <grvngr@gmail.com>
Committed: Wed May 3 11:48:31 2017 +0530

----------------------------------------------------------------------
 .../ZEPPELIN/0.6.0.2.5/package/scripts/master.py               | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/aa34023e/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
index fbf2246..c2f81639 100644
--- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
+++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
@@ -295,6 +295,12 @@ class Master(Script):
           interpreter['properties']['zeppelin.jdbc.auth.type'] = "KERBEROS"
           interpreter['properties']['zeppelin.jdbc.principal'] = params.zeppelin_kerberos_principal
           interpreter['properties']['zeppelin.jdbc.keytab.location'] = params.zeppelin_kerberos_keytab
+          if params.zookeeper_znode_parent \
+              and params.hbase_zookeeper_quorum \
+              and params.zookeeper_znode_parent not in interpreter['properties']['phoenix.url']:
+            interpreter['properties']['phoenix.url'] = "jdbc:phoenix:" + \
+                                                       params.hbase_zookeeper_quorum + ':'
+ \
+                                                       params.zookeeper_znode_parent
         else:
           interpreter['properties']['zeppelin.jdbc.auth.type'] = ""
           interpreter['properties']['zeppelin.jdbc.principal'] = ""


Mime
View raw message