ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlun...@apache.org
Subject ambari git commit: AMBARI-18217: Zeppelin service check fails after enabling SSL for Zeppelin (Renjith Kamath via jluniya)
Date Mon, 22 Aug 2016 17:56:10 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 e9dd6bece -> f21b94b07


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/f21b94b0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f21b94b0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f21b94b0

Branch: refs/heads/branch-2.4
Commit: f21b94b071a1dabb680bb0b1e1449bfbc7c24354
Parents: e9dd6be
Author: Jayush Luniya <jluniya@hortonworks.com>
Authored: Mon Aug 22 10:46:59 2016 -0700
Committer: Jayush Luniya <jluniya@hortonworks.com>
Committed: Mon Aug 22 10:56:06 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/f21b94b0/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/f21b94b0/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 23e9f96..d82f3af 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
@@ -30,7 +30,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)


Mime
View raw message