This is an automated email from the ASF dual-hosted git repository.
amagyar 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 f35b251 AMBARI-24570. Atlas should handle a customized Zookeeper
service principal name (amagyar) (#2210)
f35b251 is described below
commit f35b251d5cc32cd0a2101140e19f7ef5b9543e90
Author: Attila Magyar <m.magy...@gmail.com>
AuthorDate: Fri Aug 31 09:11:59 2018 +0200
AMBARI-24570. Atlas should handle a customized Zookeeper service principal
name (amagyar) (#2210)
---
.../common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml | 2 +-
.../common-services/ATLAS/0.1.0.2.3/package/scripts/params.py | 3 +++
.../stacks/HDP/2.5/services/ATLAS/configuration/atlas-env.xml | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
index bf434be..f5a9b77 100644
---
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
+++
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
@@ -116,7 +116,7 @@ export JAVA_HOME={{java64_home}}
# any additional java opts you want to set. This will apply to both client and
server operations
{% if security_enabled %}
-export METADATA_OPTS="{{metadata_opts}}
-Djava.security.auth.login.config={{atlas_jaas_file}}"
+export METADATA_OPTS="{{metadata_opts}}
-Dzookeeper.sasl.client.username={{zk_principal_user}}
-Djava.security.auth.login.config={{atlas_jaas_file}}"
{% else %}
export METADATA_OPTS="{{metadata_opts}}"
{% endif %}
diff --git
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
index 12d7559..f01eab1 100644
---
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
@@ -89,6 +89,9 @@ cluster_name = config['clusterName']
java_version = expect("/ambariLevelParams/java_version", int)
+zk_principal_name =
default("/configurations/zookeeper-env/zookeeper_principal_name",
"zookeeper/_h...@example.com")
+zk_principal_user = zk_principal_name.split('/')[0]
+
zk_root =
default('/configurations/application-properties/atlas.server.ha.zookeeper.zkroot',
'/apache_atlas')
stack_supports_zk_security =
check_stack_feature(StackFeature.SECURE_ZOOKEEPER,
version_for_stack_feature_checks)
atlas_kafka_group_id =
default('/configurations/application-properties/atlas.kafka.hook.group.id',
None)
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/atlas-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/atlas-env.xml
index 87f9f38..c566ddc 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/atlas-env.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/atlas-env.xml
@@ -121,7 +121,7 @@
# any additional java opts you want to set. This will apply to both
client and server operations
{% if security_enabled %}
- export ATLAS_OPTS="{{metadata_opts}}
-Djava.security.auth.login.config={{atlas_jaas_file}}"
+ export ATLAS_OPTS="{{metadata_opts}}
-Dzookeeper.sasl.client.username={{zk_principal_user}}
-Djava.security.auth.login.config={{atlas_jaas_file}}"
{% else %}
export ATLAS_OPTS="{{metadata_opts}}"
{% endif %}
