This is an automated email from the ASF dual-hosted git repository.
aonishuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 926274d AMBARI-23412. Knox service check fails if parameters from
ambari-env.sh are necessary for python command (aonishuk)
926274d is described below
commit 926274db8c19ccdbf94e0a0db7799e8a27461e94
Author: Andrew Onishuk <[email protected]>
AuthorDate: Fri Mar 30 13:56:50 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 a2134d6..e2270e4 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
@@ -68,7 +68,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}")
@@ -93,4 +93,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
[email protected].
