Repository: ambari Updated Branches: refs/heads/trunk 54ef1b5a3 -> 028f996a5
AMBARI-6397. Ambari 1.6.0 customized zookeeper keytab file not passed to zookeeper_jass.conf (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/028f996a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/028f996a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/028f996a Branch: refs/heads/trunk Commit: 028f996a55f5f623e777086f2527c9f5563322f2 Parents: 54ef1b5 Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Mon Jul 7 19:42:10 2014 +0300 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Mon Jul 7 19:42:10 2014 +0300 ---------------------------------------------------------------------- .../stacks/HDP/1.3.2/services/ZOOKEEPER/package/scripts/params.py | 3 +-- .../stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/028f996a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/scripts/params.py index 64e080e..78f31e2 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/scripts/params.py @@ -58,8 +58,7 @@ java64_home = config['hostLevelParams']['java_home'] zookeeper_hosts = config['clusterHostInfo']['zookeeper_hosts'] zookeeper_hosts.sort() -keytab_path = "/etc/security/keytabs" -zk_keytab_path = format("{keytab_path}/zk.service.keytab") +zk_keytab_path = config['configurations']['global']['zookeeper_keytab_path'] zk_server_jaas_file = format("{config_dir}/zookeeper_jaas.conf") zk_client_jaas_file = format("{config_dir}/zookeeper_client_jaas.conf") _authentication = config['configurations']['core-site']['hadoop.security.authentication'] http://git-wip-us.apache.org/repos/asf/ambari/blob/028f996a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py index 64e080e..78f31e2 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py @@ -58,8 +58,7 @@ java64_home = config['hostLevelParams']['java_home'] zookeeper_hosts = config['clusterHostInfo']['zookeeper_hosts'] zookeeper_hosts.sort() -keytab_path = "/etc/security/keytabs" -zk_keytab_path = format("{keytab_path}/zk.service.keytab") +zk_keytab_path = config['configurations']['global']['zookeeper_keytab_path'] zk_server_jaas_file = format("{config_dir}/zookeeper_jaas.conf") zk_client_jaas_file = format("{config_dir}/zookeeper_client_jaas.conf") _authentication = config['configurations']['core-site']['hadoop.security.authentication']
