You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2017/06/09 18:47:13 UTC
[5/9] ambari git commit: AMBARI-20929: Changes in Zeppelin JDBC
config after ZEPPELIN-2367 (Prabhjyot Singh via nitirajrathore)
AMBARI-20929: Changes in Zeppelin JDBC config after ZEPPELIN-2367 (Prabhjyot Singh via nitirajrathore)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/215bd7aa
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/215bd7aa
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/215bd7aa
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 215bd7aaa3cdefe1bdc9242c4fa8e9d0106d8740
Parents: 57bb136
Author: Nitiraj Singh Rathore <ni...@gmail.com>
Authored: Fri Jun 9 14:19:38 2017 +0530
Committer: Nitiraj Singh Rathore <ni...@gmail.com>
Committed: Fri Jun 9 14:20:37 2017 +0530
----------------------------------------------------------------------
.../common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/215bd7aa/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 c2f81639..3d516b0 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
@@ -302,7 +302,7 @@ class Master(Script):
params.hbase_zookeeper_quorum + ':' + \
params.zookeeper_znode_parent
else:
- interpreter['properties']['zeppelin.jdbc.auth.type'] = ""
+ interpreter['properties']['zeppelin.jdbc.auth.type'] = "SIMPLE"
interpreter['properties']['zeppelin.jdbc.principal'] = ""
interpreter['properties']['zeppelin.jdbc.keytab.location'] = ""
elif interpreter['group'] == 'sh':
@@ -354,6 +354,7 @@ class Master(Script):
interpreter['properties']['hive.driver'] = 'org.apache.hive.jdbc.HiveDriver'
interpreter['properties']['hive.user'] = 'hive'
interpreter['properties']['hive.password'] = ''
+ interpreter['properties']['hive.proxy.user.property'] = 'hive.server2.proxy.user'
if params.hive_server2_support_dynamic_service_discovery:
interpreter['properties']['hive.url'] = 'jdbc:hive2://' + \
params.hive_zookeeper_quorum + \
@@ -367,6 +368,7 @@ class Master(Script):
interpreter['properties'][hive_interactive_properties_key + '.driver'] = 'org.apache.hive.jdbc.HiveDriver'
interpreter['properties'][hive_interactive_properties_key + '.user'] = 'hive'
interpreter['properties'][hive_interactive_properties_key + '.password'] = ''
+ interpreter['properties'][hive_interactive_properties_key + '.property'] = 'hive.server2.proxy.user'
if params.hive_server2_support_dynamic_service_discovery:
interpreter['properties'][hive_interactive_properties_key + '.url'] = 'jdbc:hive2://' + \
params.hive_zookeeper_quorum + \