You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2017/05/03 16:47:28 UTC
[45/53] [abbrv] 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)
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/4134bbfb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4134bbfb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4134bbfb
Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 4134bbfb0a2c02b81f66dbed954fb9495ef969f2
Parents: 05cf0dd
Author: Gaurav Nagar <gr...@gmail.com>
Authored: Wed May 3 11:48:31 2017 +0530
Committer: Gaurav Nagar <gr...@gmail.com>
Committed: Wed May 3 11:49:23 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/4134bbfb/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'] = ""