[ambari] branch branch-2.6 updated: AMBARI-23412. Knox service check fails if parameters from ambari-env.sh are necessary for python command (aonishuk)

[ao...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

aonishuk pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.6 by this push:
     new 0826b15  AMBARI-23412. Knox service check fails if parameters from ambari-env.sh are necessary for python command (aonishuk)
0826b15 is described below

commit 0826b15fe9b82d36631cd1e08241247f4a25bbaf
Author: Andrew Onishuk <ao...@hortonworks.com>
AuthorDate: Fri Mar 30 14:05:00 2018 +0300

    AMBARI-23412. Knox service check fails if parameters from ambari-env.sh are necessary for python command (aonishuk)
---
 .../common-services/KNOX/0.5.0.2.2/package/scripts/service_check.py   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/service_check.py
index 5e9b89e..72ab555 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/service_check.py
@@ -65,7 +65,7 @@ class KnoxServiceCheckDefault(KnoxServiceCheck):
     validateKnoxFileName = "validateKnoxStatus.py"
     validateKnoxFilePath = format("{tmp_dir}/{validateKnoxFileName}")
     python_executable = sys.executable
-    validateStatusCmd = format("{python_executable} {validateKnoxFilePath} -p {knox_host_port} -n {knox_host_name}")
+    validateStatusCmd = format("source /var/lib/ambari-agent/ambari-env.sh ; {python_executable} {validateKnoxFilePath} -p {knox_host_port} -n {knox_host_name}")
     if params.security_enabled:
       kinit_cmd = format("{kinit_path_local} -kt {smoke_user_keytab} {smokeuser_principal};")
       smoke_cmd = format("{kinit_cmd} {validateStatusCmd}")
@@ -90,4 +90,4 @@ class KnoxServiceCheckDefault(KnoxServiceCheck):
 
 
 if __name__ == "__main__":
-    KnoxServiceCheck().execute()
\ No newline at end of file
+    KnoxServiceCheck().execute()

-- 
To stop receiving notification emails like this one, please contact
aonishuk@apache.org.