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 2018/01/05 23:04:38 UTC
[42/50] [abbrv] ambari git commit: AMBARI-22648: zeppelin server
keytab missing from zeppelin-site.xml (Bikas Saha via jluniya)
AMBARI-22648: zeppelin server keytab missing from zeppelin-site.xml (Bikas Saha via jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/67b06423
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/67b06423
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/67b06423
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 67b06423b8872e67c7ec75b73f2ac415f55914ca
Parents: ada1ea5
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Thu Dec 14 16:41:43 2017 -0800
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Fri Jan 5 17:54:16 2018 -0500
----------------------------------------------------------------------
.../common-services/ZEPPELIN/0.7.0/package/scripts/master.py | 8 +++++++-
.../src/test/python/stacks/2.6/configs/default.json | 2 ++
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/67b06423/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
index ee264a4..df892f8 100644
--- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
+++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
@@ -137,9 +137,15 @@ class Master(Script):
self.chown_zeppelin_pid_dir(env)
# write out zeppelin-site.xml
+ my_map = {}
+ for key, value in params.config['configurations']['zeppelin-config'].iteritems():
+ my_map[key]=value
+ my_map['zeppelin.server.kerberos.keytab']=params.zeppelin_kerberos_keytab
+ my_map['zeppelin.server.kerberos.principal']=params.zeppelin_kerberos_principal
+
XmlConfig("zeppelin-site.xml",
conf_dir=params.conf_dir,
- configurations=params.config['configurations']['zeppelin-config'],
+ configurations=my_map,
owner=params.zeppelin_user,
group=params.zeppelin_group
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/67b06423/ambari-server/src/test/python/stacks/2.6/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.6/configs/default.json b/ambari-server/src/test/python/stacks/2.6/configs/default.json
index 10647fd..fb7cb49 100644
--- a/ambari-server/src/test/python/stacks/2.6/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.6/configs/default.json
@@ -362,6 +362,8 @@
"zeppelin.notebook.s3.bucket": "zeppelin",
"zeppelin.notebook.homescreen.hide": "false",
"zeppelin.server.allowed.origins": "*",
+ "zeppelin.server.kerberos.keytab": "",
+ "zeppelin.server.kerberos.principal": "",
"zeppelin.interpreter.config.upgrade": "true"
},
"zoo.cfg": {