Repository: ambari Updated Branches: refs/heads/trunk a53b2c8d9 -> 16342e0b8
AMBARI-17735. Zeppelin server should have yarn-client installed (Renjith Kamath via smohanty) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/16342e0b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/16342e0b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/16342e0b Branch: refs/heads/trunk Commit: 16342e0b8d59578eceb211a2c9873d9b0788e078 Parents: a53b2c8 Author: Sumit Mohanty <[email protected]> Authored: Fri Jul 15 08:11:27 2016 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Fri Jul 15 08:11:54 2016 -0700 ---------------------------------------------------------------------- .../resources/common-services/ZEPPELIN/0.6.0.2.5/metainfo.xml | 7 +++++++ .../ZEPPELIN/0.6.0.2.5/package/scripts/master.py | 4 ++-- .../ZEPPELIN/0.6.0.2.5/package/scripts/service_check.py | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/16342e0b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/metainfo.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/metainfo.xml index 1f4e446..1eb3155 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/metainfo.xml @@ -45,6 +45,13 @@ limitations under the License. <enabled>true</enabled> </auto-deploy> </dependency> + <dependency> + <name>YARN/YARN_CLIENT</name> + <scope>host</scope> + <auto-deploy> + <enabled>true</enabled> + </auto-deploy> + </dependency> </dependencies> <logs> <log> http://git-wip-us.apache.org/repos/asf/ambari/blob/16342e0b/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 9a77f57..2de99b1 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 @@ -150,8 +150,8 @@ class Master(Script): self.configure(env) if params.security_enabled: - spark_kinit_cmd = format("{kinit_path_local} -kt {zeppelin_kerberos_keytab} {zeppelin_kerberos_principal}; ") - Execute(spark_kinit_cmd, user=params.zeppelin_user) + zeppelin_kinit_cmd = format("{kinit_path_local} -kt {zeppelin_kerberos_keytab} {zeppelin_kerberos_principal}; ") + Execute(zeppelin_kinit_cmd, user=params.zeppelin_user) if glob.glob( params.zeppelin_dir + '/interpreter/spark/dep/zeppelin-spark-dependencies-*.jar') and os.path.exists( http://git-wip-us.apache.org/repos/asf/ambari/blob/16342e0b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/service_check.py index 4170e10..b7099f1 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/service_check.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/service_check.py @@ -26,8 +26,8 @@ class ZeppelinServiceCheck(Script): env.set_params(params) if params.security_enabled: - spark_kinit_cmd = format("{kinit_path_local} -kt {zeppelin_kerberos_keytab} {zeppelin_kerberos_principal}; ") - Execute(spark_kinit_cmd, user=params.zeppelin_user) + zeppelin_kinit_cmd = format("{kinit_path_local} -kt {zeppelin_kerberos_keytab} {zeppelin_kerberos_principal}; ") + Execute(zeppelin_kinit_cmd, user=params.zeppelin_user) Execute(format("curl -s -o /dev/null -w'%{{http_code}}' --negotiate -u: -k {zeppelin_host}:{zeppelin_port} | grep 200"), tries = 10,
