You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2014/11/06 21:04:32 UTC
ambari git commit: Revert "AMBARI-8172. Knox Gateway failed to start
when Knox service account name was customized. (Sumit Gupta via yusaku)"
Repository: ambari
Updated Branches:
refs/heads/trunk 662ce6007 -> f0d571c3a
Revert "AMBARI-8172. Knox Gateway failed to start when Knox service account name was customized. (Sumit Gupta via yusaku)"
This reverts commit c097a8f7bcd86aa4b102bedda714c4122682b058.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f0d571c3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f0d571c3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f0d571c3
Branch: refs/heads/trunk
Commit: f0d571c3a780ae952de0b272f82b6047b7c7f9fd
Parents: 662ce60
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Thu Nov 6 12:05:07 2014 -0800
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Thu Nov 6 12:05:12 2014 -0800
----------------------------------------------------------------------
.../stacks/HDP/2.2/services/KNOX/package/scripts/knox.py | 3 ---
.../stacks/HDP/2.2/services/KNOX/package/scripts/params.py | 3 ---
2 files changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f0d571c3/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
index 627462a..2061db1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
@@ -55,8 +55,6 @@ def knox():
owner = params.knox_user,
template_tag = None
)
- cmd = format('chown -R {knox_user}:{knox_group} {knox_data_dir} {knox_logs_dir} {knox_pid_dir} {knox_conf_dir}')
- Execute(cmd)
cmd = format('{knox_client_bin} create-master --master {knox_master_secret!p}')
Execute(cmd,
@@ -71,4 +69,3 @@ def knox():
environment={'JAVA_HOME': params.java_home},
not_if=format('test -f {knox_cert_store_path}')
)
-
http://git-wip-us.apache.org/repos/asf/ambari/blob/f0d571c3/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
index 326d678..e11f287 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
@@ -110,9 +110,6 @@ if has_oozie:
# server configurations
knox_conf_dir = '/etc/knox/conf'
-knox_data_dir = '/var/lib/knox/data'
-knox_logs_dir = '/var/log/knox'
-knox_pid_dir = status_params.knox_pid_dir
knox_user = default("/configurations/knox-env/knox_user", "knox")
knox_group = default("/configurations/knox-env/knox_group", "knox")
knox_pid_file = status_params.knox_pid_file