Repository: ambari Updated Branches: refs/heads/branch-2.2 b831773c5 -> ea069b334
AMBARI-15296. Missing property: hive.server2.authentication.kerberos.keytab. (Laszlo Puskas via stoader) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ea069b33 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ea069b33 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ea069b33 Branch: refs/heads/branch-2.2 Commit: ea069b334ae0b163c0670145c02f10e92d64d101 Parents: b831773 Author: Toader, Sebastian <stoa...@hortonworks.com> Authored: Wed Mar 9 20:41:07 2016 +0100 Committer: Toader, Sebastian <stoa...@hortonworks.com> Committed: Thu Mar 10 06:50:37 2016 +0100 ---------------------------------------------------------------------- .../main/resources/stacks/HDP/2.2/services/stack_advisor.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ea069b33/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py index 43a9190..2518528 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py @@ -493,8 +493,10 @@ class HDP22StackAdvisor(HDP21StackAdvisor): putHiveSitePropertyAttribute("hive.server2.authentication.ldap.url", "delete", "true") if hive_server2_auth == "kerberos": - putHiveSiteProperty("hive.server2.authentication.kerberos.keytab", "") - putHiveSiteProperty("hive.server2.authentication.kerberos.principal", "") + if "hive-site" in services["configurations"] and "hive.server2.authentication.kerberos.keytab" not in services["configurations"]["hive-site"]["properties"]: + putHiveSiteProperty("hive.server2.authentication.kerberos.keytab", "") + if "hive-site" in services["configurations"] and "hive.server2.authentication.kerberos.principal" not in services["configurations"]["hive-site"]["properties"]: + putHiveSiteProperty("hive.server2.authentication.kerberos.principal", "") elif "KERBEROS" not in servicesList: # Since 'hive_server2_auth' cannot be relied on within the default, empty recommendations request if ("hive.server2.authentication.kerberos.keytab" in configurations["hive-site"]["properties"]) or \ ("hive-site" not in services["configurations"]) or \
