AMBARI-19539. Spark2 Service check fails on WE enabled cluster (Bikas Saha via smohanty)

ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py

@@ -116,10 +116,13 @@ else:
 ui_ssl_enabled = default("configurations/spark2-defaults/spark.ssl.enabled", False)
 
 spark_yarn_historyServer_address = default(spark_history_server_host, "localhost")
-
+spark_history_scheme = "http"
 spark_history_ui_port = config['configurations']['spark2-defaults']['spark.history.ui.port']
+
 if ui_ssl_enabled:
   spark_history_ui_port = str(int(spark_history_ui_port) + 400)
+  spark_history_scheme = "https"
+
 
 spark_env_sh = config['configurations']['spark2-env']['content']
 spark_log4j_properties = config['configurations']['spark2-log4j-properties']['content']

ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/service_check.py

@@ -36,7 +36,7 @@ class SparkServiceCheck(Script):
         livy_kinit_cmd = format("{kinit_path_local} -kt {smoke_user_keytab} {smokeuser_principal}; ")
         Execute(livy_kinit_cmd, user=params.livy2_user)
 
-    Execute(format("curl -s -o /dev/null -w'%{{http_code}}' --negotiate -u: -k http://{spark_history_server_host}:{spark_history_ui_port} | grep 200"),
+    Execute(format("curl -s -o /dev/null -w'%{{http_code}}' --negotiate -u: -k {spark_history_scheme}://{spark_history_server_host}:{spark_history_ui_port} | grep 200"),
             tries=5,
             try_sleep=3,
             logoutput=True