Repository: ambari Updated Branches: refs/heads/trunk 2f41f02d7 -> e49cf155c
AMBARI-5710. WebHCat (WebHCat Server) start failed (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e49cf155 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e49cf155 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e49cf155 Branch: refs/heads/trunk Commit: e49cf155c1697e77b83b95e1f973b15b7ecae821 Parents: 2f41f02 Author: Andrew Onishuk <[email protected]> Authored: Thu May 8 15:34:46 2014 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Thu May 8 15:34:46 2014 +0300 ---------------------------------------------------------------------- .../HDP/1.3.2/services/WEBHCAT/package/scripts/webhcat.py | 2 +- .../HDP/2.0.6/services/WEBHCAT/package/scripts/webhcat.py | 2 +- .../test/python/stacks/1.3.2/WEBHCAT/test_webhcat_server.py | 8 ++++---- .../test/python/stacks/2.0.6/WEBHCAT/test_webhcat_server.py | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e49cf155/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/WEBHCAT/package/scripts/webhcat.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/WEBHCAT/package/scripts/webhcat.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/WEBHCAT/package/scripts/webhcat.py index be592d7..b2ef5dd 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/WEBHCAT/package/scripts/webhcat.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/WEBHCAT/package/scripts/webhcat.py @@ -72,7 +72,7 @@ def webhcat(): ) if params.security_enabled: - kinit_if_needed = format("{kinit_path_local} -kt {smoke_user_keytab} {smokeuser};") + kinit_if_needed = format("{kinit_path_local} -kt {hdfs_user_keytab} {hdfs_user};") else: kinit_if_needed = "" http://git-wip-us.apache.org/repos/asf/ambari/blob/e49cf155/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/package/scripts/webhcat.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/package/scripts/webhcat.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/package/scripts/webhcat.py index 9b98d0d..65a7783 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/package/scripts/webhcat.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/package/scripts/webhcat.py @@ -74,7 +74,7 @@ def webhcat(): ) if params.security_enabled: - kinit_if_needed = format("{kinit_path_local} -kt {smoke_user_keytab} {smokeuser};") + kinit_if_needed = format("{kinit_path_local} -kt {hdfs_user_keytab} {hdfs_user};") else: kinit_if_needed = "" http://git-wip-us.apache.org/repos/asf/ambari/blob/e49cf155/ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_server.py b/ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_server.py index 8b363fd..32600fc 100644 --- a/ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_server.py +++ b/ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_server.py @@ -229,7 +229,7 @@ class TestWebHCatServer(RMFTestCase): owner = 'hcat', group = 'hadoop', ) - self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa;', + self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', path = ['/bin'], user = 'hcat', ) @@ -237,20 +237,20 @@ class TestWebHCatServer(RMFTestCase): owner='hcat', mode=0755, dest_dir='/apps/webhcat', - kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa;', + kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', hdfs_user='hdfs' ) self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/pig.tar.gz', owner='hcat', mode=0755, dest_dir='/apps/webhcat', - kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa;', + kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', hdfs_user='hdfs' ) self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/hive.tar.gz', owner='hcat', mode=0755, dest_dir='/apps/webhcat', - kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa;', + kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', hdfs_user='hdfs' ) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/e49cf155/ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_server.py b/ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_server.py index 9368ad6..4fd9a03 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_server.py @@ -232,7 +232,7 @@ class TestWebHCatServer(RMFTestCase): owner = 'hcat', group = 'hadoop', ) - self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa;', + self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', path = ['/bin'], user = 'hcat', ) @@ -240,20 +240,20 @@ class TestWebHCatServer(RMFTestCase): owner='hcat', mode=0755, dest_dir='/apps/webhcat', - kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa;', + kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', hdfs_user='hdfs' ) self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/pig.tar.gz', owner='hcat', mode=0755, dest_dir='/apps/webhcat', - kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa;', + kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', hdfs_user='hdfs' ) self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/hive.tar.gz', owner='hcat', mode=0755, dest_dir='/apps/webhcat', - kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa;', + kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', hdfs_user='hdfs' ) \ No newline at end of file
