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 b2ad409 AMBARI-24576. Ambari Metrics should handle a customized
Zookeeper service principal name (amagyar) (#2220)
b2ad409 is described below
commit b2ad409d8cff0f32bc6617138c2561ba79c41e86
Author: Attila Magyar <[email protected]>
AuthorDate: Tue Sep 4 10:52:56 2018 +0200
AMBARI-24576. Ambari Metrics should handle a customized Zookeeper service
principal name (amagyar) (#2220)
---
.../AMBARI_METRICS/0.1.0/configuration/ams-env.xml | 2 +-
.../AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml | 8 ++++----
.../AMBARI_METRICS/0.1.0/package/scripts/params_linux.py | 3 +++
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
index 1411ba1..c565201 100644
---
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
+++
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
@@ -187,7 +187,7 @@ export
AMS_HBASE_INIT_CHECK_ENABLED={{ams_hbase_init_check_enabled}}
# AMS Collector options
export
AMS_COLLECTOR_OPTS="-Djava.library.path=/usr/lib/ams-hbase/lib/hadoop-native"
{% if security_enabled %}
-export AMS_COLLECTOR_OPTS="$AMS_COLLECTOR_OPTS
-Djava.security.auth.login.config={{ams_collector_jaas_config_file}}"
+export AMS_COLLECTOR_OPTS="$AMS_COLLECTOR_OPTS
-Dzookeeper.sasl.client.username={{zk_principal_user}}
-Djava.security.auth.login.config={{ams_collector_jaas_config_file}}"
{% endif %}
# AMS Collector GC options
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
index 11f8f9c..77c2406 100644
---
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
+++
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
@@ -272,10 +272,10 @@ export HBASE_PID_DIR={{hbase_pid_dir}}
export HBASE_MANAGES_ZK=false
{% if security_enabled %}
-export HBASE_OPTS="$HBASE_OPTS
-Djava.security.auth.login.config={{client_jaas_config_file}}"
-export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS
-Djava.security.auth.login.config={{master_jaas_config_file}}
-Djavax.security.auth.useSubjectCredsOnly=false"
-export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS
-Djava.security.auth.login.config={{regionserver_jaas_config_file}}
-Djavax.security.auth.useSubjectCredsOnly=false"
-export HBASE_ZOOKEEPER_OPTS="$HBASE_ZOOKEEPER_OPTS
-Djava.security.auth.login.config={{ams_zookeeper_jaas_config_file}}"
+export HBASE_OPTS="$HBASE_OPTS
-Dzookeeper.sasl.client.username={{zk_principal_user}}
-Djava.security.auth.login.config={{client_jaas_config_file}}"
+export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS
-Dzookeeper.sasl.client.username={{zk_principal_user}}
-Djava.security.auth.login.config={{master_jaas_config_file}}
-Djavax.security.auth.useSubjectCredsOnly=false"
+export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS
-Dzookeeper.sasl.client.username={{zk_principal_user}}
-Djava.security.auth.login.config={{regionserver_jaas_config_file}}
-Djavax.security.auth.useSubjectCredsOnly=false"
+export HBASE_ZOOKEEPER_OPTS="$HBASE_ZOOKEEPER_OPTS
-Dzookeeper.sasl.client.username={{zk_principal_user}}
-Djava.security.auth.login.config={{ams_zookeeper_jaas_config_file}}"
{% endif %}
# use embedded native libs
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py
index e05b22c..92bfed9 100644
---
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py
@@ -63,6 +63,9 @@ sudo = AMBARI_SUDO_BINARY
dfs_type = default("/clusterLevelParams/dfs_type", "")
+zk_principal_name =
default("/configurations/zookeeper-env/zookeeper_principal_name",
"zookeeper/[email protected]")
+zk_principal_user = zk_principal_name.split('/')[0]
+
hbase_regionserver_shutdown_timeout =
expect('/configurations/ams-hbase-env/hbase_regionserver_shutdown_timeout', int,
30)
