This is an automated email from the ASF dual-hosted git repository.
dmitriusan pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new 9f86a34 AMBARI-24564. Zookeeper should handle a customized Zookeeper
service … (#2203)
9f86a34 is described below
commit 9f86a344cc07fe426e4a72b989cd10267297acc5
Author: Lisnichenko Dmitro <[email protected]>
AuthorDate: Wed Sep 5 19:44:22 2018 +0300
AMBARI-24564. Zookeeper should handle a customized Zookeeper service …
(#2203)
* AMBARI-24564. Zookeeper should handle a customized Zookeeper service
principal name (dlysnichenko)
#
* AMBARI-24564. Zookeeper should handle a customized Zookeeper service
principal name (dlysnichenko)
* AMBARI-24564. Zookeeper should handle a customized Zookeeper service
principal name. Fix default value (dlysnichenko)
---
.../common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml | 2 +-
.../common-services/ZOOKEEPER/3.4.5/package/scripts/params_linux.py | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml
index 868f520..deb0671 100644
---
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml
+++
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml
@@ -102,7 +102,7 @@ export CLASSPATH=$CLASSPATH:/usr/share/zookeeper/*
{% if security_enabled %}
export SERVER_JVMFLAGS="$SERVER_JVMFLAGS
-Djava.security.auth.login.config={{zk_server_jaas_file}}"
-export CLIENT_JVMFLAGS="$CLIENT_JVMFLAGS
-Djava.security.auth.login.config={{zk_client_jaas_file}}"
+export CLIENT_JVMFLAGS="$CLIENT_JVMFLAGS
-Djava.security.auth.login.config={{zk_client_jaas_file}}
-Dzookeeper.sasl.client.username={{zk_principal_user}}"
{% endif %}
</value>
<value-attributes>
diff --git
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/params_linux.py
index 96de22c..de4073a 100644
---
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/params_linux.py
@@ -81,7 +81,8 @@ else:
zoo_cfg_properties_map = {}
zoo_cfg_properties_map_length = len(zoo_cfg_properties_map)
-zk_principal_name =
default("/configurations/zookeeper-env/zookeeper_principal_name",
"[email protected]")
+zk_principal_name =
default("/configurations/zookeeper-env/zookeeper_principal_name",
"zookeeper/[email protected]")
+zk_principal_user = zk_principal_name.split('/')[0]
zk_principal = zk_principal_name.replace('_HOST',hostname.lower())
java64_home = config['ambariLevelParams']['java_home']
