Repository: ambari Updated Branches: refs/heads/trunk 4b9a81684 -> a56891e78
AMBARI-18217: Zeppelin service check fails after enabling SSL for Zeppelin (Renjith Kamath via jluniya) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a56891e7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a56891e7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a56891e7 Branch: refs/heads/trunk Commit: a56891e781480993c92333006b6ccf5b22bb3e54 Parents: 4b9a816 Author: Jayush Luniya <[email protected]> Authored: Mon Aug 22 10:46:59 2016 -0700 Committer: Jayush Luniya <[email protected]> Committed: Mon Aug 22 10:46:59 2016 -0700 ---------------------------------------------------------------------- .../common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py | 1 + .../ZEPPELIN/0.6.0.2.5/package/scripts/service_check.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a56891e7/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py index 340315f..27ed150 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py @@ -99,6 +99,7 @@ master_configs = config['clusterHostInfo'] java64_home = config['hostLevelParams']['java_home'] ambari_host = str(master_configs['ambari_server_host'][0]) zeppelin_host = str(master_configs['zeppelin_master_hosts'][0]) +ui_ssl_enabled = config['configurations']['zeppelin-config']['zeppelin.ssl'] # detect HS2 details, if installed http://git-wip-us.apache.org/repos/asf/ambari/blob/a56891e7/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 b7099f1..bd7c855 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 @@ -29,7 +29,8 @@ class ZeppelinServiceCheck(Script): 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"), + scheme = "https" if params.ui_ssl_enabled else "http" + Execute(format("curl -s -o /dev/null -w'%{{http_code}}' --negotiate -u: -k {scheme}://{zeppelin_host}:{zeppelin_port} | grep 200"), tries = 10, try_sleep=3, logoutput=True)
