Repository: ambari Updated Branches: refs/heads/trunk 81af756ad -> 630b501ef
AMBARI-11124. PIG service check fails on enabling security (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/630b501e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/630b501e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/630b501e Branch: refs/heads/trunk Commit: 630b501ef478d6b63226ae5b66768ac16692c3d8 Parents: 81af756 Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Thu May 14 12:22:45 2015 +0300 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Thu May 14 12:22:45 2015 +0300 ---------------------------------------------------------------------- .../PIG/0.12.0.2.0/package/scripts/params_linux.py | 2 +- .../src/test/python/stacks/2.2/PIG/test_pig_service_check.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/630b501e/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params_linux.py index 5bcffc7..fc39bc6 100644 --- a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params_linux.py @@ -80,7 +80,7 @@ import functools #to create hdfs directory we need to call params.HdfsResource in code HdfsResource = functools.partial( HdfsResource, - user=hdfs_principal_name if security_enabled else hdfs_user, + user=hdfs_user, security_enabled = security_enabled, keytab = hdfs_user_keytab, kinit_path_local = kinit_path_local, http://git-wip-us.apache.org/repos/asf/ambari/blob/630b501e/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py b/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py index b7968d2..039b14d 100644 --- a/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py +++ b/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py @@ -61,7 +61,7 @@ class TestPigServiceCheck(RMFTestCase): hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', keytab = '/etc/security/keytabs/hdfs.headless.keytab', kinit_path_local = '/usr/bin/kinit', - user = 'h...@example.com', + user = 'hdfs', action = ['execute'], hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', ) @@ -111,7 +111,7 @@ class TestPigServiceCheck(RMFTestCase): keytab = '/etc/security/keytabs/hdfs.headless.keytab', source = '/usr/hdp/current/tez-client/lib/tez.tar.gz', kinit_path_local = '/usr/bin/kinit', - user = 'h...@example.com', + user = 'hdfs', owner = 'hdfs', group = 'hadoop', hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', @@ -123,7 +123,7 @@ class TestPigServiceCheck(RMFTestCase): hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', keytab = '/etc/security/keytabs/hdfs.headless.keytab', kinit_path_local = '/usr/bin/kinit', - user = 'h...@example.com', + user = 'hdfs', action = ['execute'], hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', )
