Repository: ambari Updated Branches: refs/heads/trunk 1103f0cec -> 4131254e4
AMBARI-9723. Added HiveMetastore failed to start on secure cluster.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4131254e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4131254e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4131254e Branch: refs/heads/trunk Commit: 4131254e42a11e5c4c385da2885d10b49402ba21 Parents: 1103f0c Author: Vitaly Brodetskyi <[email protected]> Authored: Fri Feb 20 16:08:10 2015 +0200 Committer: Vitaly Brodetskyi <[email protected]> Committed: Fri Feb 20 16:08:10 2015 +0200 ---------------------------------------------------------------------- .../common-services/HIVE/0.12.0.2.0/package/scripts/params.py | 2 +- .../src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py | 2 +- .../src/test/python/stacks/2.0.6/HIVE/test_hive_server.py | 2 +- .../src/test/python/stacks/2.1/HIVE/test_hive_metastore.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4131254e/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params.py index c6bb3f2..61043da 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params.py @@ -404,4 +404,4 @@ ranger_driver_curl_source = format("{jdk_location}/{ranger_jdbc_symlink_name}") ranger_driver_curl_target = format("{java_share_dir}/{ranger_jdbc_jar_name}") if security_enabled: - hive_principal = hive_server_principal.replace('_HOST',hive_server_host.lower()) \ No newline at end of file + hive_principal = hive_server_principal.replace('_HOST',hostname.lower()) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/4131254e/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py index ed936d0..e302cba 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py @@ -102,7 +102,7 @@ class TestHiveMetastore(RMFTestCase): target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() - self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/hive.service.keytab hive/[email protected]; ', + self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/hive.service.keytab hive/[email protected]; ', user = 'hive', ) self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/start_metastore_script /var/log/hive/hive.out /var/log/hive/hive.log /var/run/hive/hive.pid /etc/hive/conf.server /var/log/hive', http://git-wip-us.apache.org/repos/asf/ambari/blob/4131254e/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py index 1fc3fbf..1d3f4cb 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py @@ -131,7 +131,7 @@ class TestHiveServer(RMFTestCase): ) self.assert_configure_secured() - self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/hive.service.keytab hive/[email protected]; ', + self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/hive.service.keytab hive/[email protected]; ', user = 'hive', ) self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/start_hiveserver2_script /var/log/hive/hive-server2.out /var/log/hive/hive-server2.log /var/run/hive/hive-server.pid /etc/hive/conf.server /var/log/hive', http://git-wip-us.apache.org/repos/asf/ambari/blob/4131254e/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py index c545e93..5b3c9d5 100644 --- a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py +++ b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py @@ -105,7 +105,7 @@ class TestHiveMetastore(RMFTestCase): ) self.assert_configure_secured() - self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/hive.service.keytab hive/[email protected]; ', + self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/hive.service.keytab hive/[email protected]; ', user = 'hive', ) self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/start_metastore_script /var/log/hive/hive.out /var/log/hive/hive.log /var/run/hive/hive.pid /etc/hive/conf.server /var/log/hive',
