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/695ea9fd Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/695ea9fd Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/695ea9fd Branch: refs/heads/branch-feature-AMBARI-22008-isilon Commit: 695ea9fdec467e6cc092f0b7357f287e98872315 Parents: 1794f3b Author: Jayush Luniya <jlun...@hortonworks.com> Authored: Thu Dec 14 16:41:43 2017 -0800 Committer: Attila Magyar <amag...@hortonworks.com> Committed: Mon Dec 18 09:12:46 2017 +0100 ---------------------------------------------------------------------- .../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/695ea9fd/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/695ea9fd/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": {
