AMBARI-20947. Use keytab file named 'hive.service.keytab' instead of 'hive.llap.zk.sm.keytab' in hive_server_interactive.py for copying to slider.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/242d9e76 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/242d9e76 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/242d9e76 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: 242d9e76f93d17532a60296d86d4e42f7299e039 Parents: 09ca031 Author: Swapan Shridhar <[email protected]> Authored: Wed May 10 17:02:42 2017 -0700 Committer: Swapan Shridhar <[email protected]> Committed: Wed May 10 17:02:42 2017 -0700 ---------------------------------------------------------------------- .../HIVE/0.12.0.2.0/package/alerts/alert_llap_app_status.py | 4 ++-- .../HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py | 3 --- .../HIVE/0.12.0.2.0/package/scripts/params_linux.py | 4 ++-- .../HIVE/2.1.0.3.0/package/alerts/alert_llap_app_status.py | 4 ++-- .../HIVE/2.1.0.3.0/package/scripts/hive_server_interactive.py | 3 --- .../HIVE/2.1.0.3.0/package/scripts/params_linux.py | 4 ++-- 6 files changed, 8 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/242d9e76/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_llap_app_status.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_llap_app_status.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_llap_app_status.py index 095be3f..98d1899 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_llap_app_status.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_llap_app_status.py @@ -47,10 +47,10 @@ UKNOWN_STATUS_CODE = 'UNKNOWN' SECURITY_ENABLED_KEY = '{{cluster-env/security_enabled}}' -HIVE_PRINCIPAL_KEY = '{{hive-interactive-site/hive.llap.zk.sm.principal}}' +HIVE_PRINCIPAL_KEY = '{{hive-interactive-site/hive.llap.daemon.service.principal}}' HIVE_PRINCIPAL_DEFAULT = 'default.hive.principal' -HIVE_PRINCIPAL_KEYTAB_KEY = '{{hive-interactive-site/hive.llap.zk.sm.keytab.file}}' +HIVE_PRINCIPAL_KEYTAB_KEY = '{{hive-interactive-site/hive.llap.daemon.keytab.file}}' HIVE_PRINCIPAL_KEYTAB_DEFAULT = 'default.hive.keytab' HIVE_AUTHENTICATION_DEFAULT = 'NOSASL' http://git-wip-us.apache.org/repos/asf/ambari/blob/242d9e76/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py index 8f57f1e..0504d18 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py @@ -365,9 +365,6 @@ class HiveServerInteractiveDefault(HiveServerInteractive): hive_interactive_kinit_cmd = format("{kinit_path_local} -kt {params.hive_server2_keytab} {params.hive_principal}; ") Execute(hive_interactive_kinit_cmd, user=params.hive_user) - llap_kinit_cmd = format("{kinit_path_local} -kt {params.hive_llap_keytab_file} {params.hive_llap_principal}; ") - Execute(llap_kinit_cmd, user=params.hive_user) - """ Get llap app status data for LLAP Tech Preview code base. """ http://git-wip-us.apache.org/repos/asf/ambari/blob/242d9e76/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py index 0f03155..d854451 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py @@ -685,8 +685,8 @@ if has_hive_interactive: llap_extra_slider_opts = default('/configurations/hive-interactive-env/llap_extra_slider_opts', "") hive_llap_principal = None if security_enabled: - hive_llap_keytab_file = config['configurations']['hive-interactive-site']['hive.llap.zk.sm.keytab.file'] - hive_llap_principal = (config['configurations']['hive-interactive-site']['hive.llap.zk.sm.principal']).replace('_HOST',hostname.lower()) + hive_llap_keytab_file = config['configurations']['hive-interactive-site']['hive.llap.daemon.keytab.file'] + hive_llap_principal = (config['configurations']['hive-interactive-site']['hive.llap.daemon.service.principal']).replace('_HOST',hostname.lower()) pass if len(hive_server_hosts) == 0 and len(hive_server_interactive_hosts) > 0: http://git-wip-us.apache.org/repos/asf/ambari/blob/242d9e76/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/alerts/alert_llap_app_status.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/alerts/alert_llap_app_status.py b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/alerts/alert_llap_app_status.py index 095be3f..98d1899 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/alerts/alert_llap_app_status.py +++ b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/alerts/alert_llap_app_status.py @@ -47,10 +47,10 @@ UKNOWN_STATUS_CODE = 'UNKNOWN' SECURITY_ENABLED_KEY = '{{cluster-env/security_enabled}}' -HIVE_PRINCIPAL_KEY = '{{hive-interactive-site/hive.llap.zk.sm.principal}}' +HIVE_PRINCIPAL_KEY = '{{hive-interactive-site/hive.llap.daemon.service.principal}}' HIVE_PRINCIPAL_DEFAULT = 'default.hive.principal' -HIVE_PRINCIPAL_KEYTAB_KEY = '{{hive-interactive-site/hive.llap.zk.sm.keytab.file}}' +HIVE_PRINCIPAL_KEYTAB_KEY = '{{hive-interactive-site/hive.llap.daemon.keytab.file}}' HIVE_PRINCIPAL_KEYTAB_DEFAULT = 'default.hive.keytab' HIVE_AUTHENTICATION_DEFAULT = 'NOSASL' http://git-wip-us.apache.org/repos/asf/ambari/blob/242d9e76/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/hive_server_interactive.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/hive_server_interactive.py b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/hive_server_interactive.py index 8f57f1e..0504d18 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/hive_server_interactive.py +++ b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/hive_server_interactive.py @@ -365,9 +365,6 @@ class HiveServerInteractiveDefault(HiveServerInteractive): hive_interactive_kinit_cmd = format("{kinit_path_local} -kt {params.hive_server2_keytab} {params.hive_principal}; ") Execute(hive_interactive_kinit_cmd, user=params.hive_user) - llap_kinit_cmd = format("{kinit_path_local} -kt {params.hive_llap_keytab_file} {params.hive_llap_principal}; ") - Execute(llap_kinit_cmd, user=params.hive_user) - """ Get llap app status data for LLAP Tech Preview code base. """ http://git-wip-us.apache.org/repos/asf/ambari/blob/242d9e76/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/params_linux.py index 69ef08e..c0ac535 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/params_linux.py @@ -684,8 +684,8 @@ if has_hive_interactive: llap_extra_slider_opts = default('/configurations/hive-interactive-env/llap_extra_slider_opts', "") hive_llap_principal = None if security_enabled: - hive_llap_keytab_file = config['configurations']['hive-interactive-site']['hive.llap.zk.sm.keytab.file'] - hive_llap_principal = (config['configurations']['hive-interactive-site']['hive.llap.zk.sm.principal']).replace('_HOST',hostname.lower()) + hive_llap_keytab_file = config['configurations']['hive-interactive-site']['hive.llap.daemon.keytab.file'] + hive_llap_principal = (config['configurations']['hive-interactive-site']['hive.llap.daemon.service.principal']).replace('_HOST',hostname.lower()) pass if len(hive_server_hosts) == 0 and len(hive_server_interactive_hosts) > 0:
