You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2014/02/07 14:12:03 UTC
git commit: AMBARI-4554. HBase service check fails on secure cluster
(aonishuk)
Updated Branches:
refs/heads/trunk 617828125 -> 556102801
AMBARI-4554. HBase service check fails on secure cluster (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/55610280
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/55610280
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/55610280
Branch: refs/heads/trunk
Commit: 556102801a008351d9c2e21870d5bd803f181759
Parents: 6178281
Author: Andrew Onischuk <ao...@hortonworks.com>
Authored: Fri Jan 17 04:19:47 2014 -0800
Committer: Andrew Onischuk <ao...@hortonworks.com>
Committed: Fri Jan 17 04:20:27 2014 -0800
----------------------------------------------------------------------
.../HDP/1.3.2/services/HBASE/package/scripts/service_check.py | 4 +---
.../HDP/2.0.6/services/HBASE/package/scripts/service_check.py | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/55610280/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/service_check.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/service_check.py
index ff6d0ed..980c630 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/service_check.py
@@ -29,7 +29,6 @@ class HbaseServiceCheck(Script):
output_file = "/apps/hbase/data/ambarismoketest"
test_cmd = format("fs -test -e {output_file}")
- kinit_cmd = format("{kinit_path_local} -kt {smoke_user_keytab} {smoke_test_user};") if params.security_enabled else ""
hbase_servicecheck_file = '/tmp/hbase-smoke.sh'
File( '/tmp/hbaseSmokeVerify.sh',
@@ -44,8 +43,7 @@ class HbaseServiceCheck(Script):
if params.security_enabled:
hbase_grant_premissions_file = '/tmp/hbase_grant_permissions.sh'
- hbase_kinit_cmd = format("{kinit_path_local} -kt {hbase_user_keytab} {hbase_user};")
- grantprivelegecmd = format("{hbase_kinit_cmd} hbase shell {hbase_grant_premissions_file}")
+ grantprivelegecmd = format("{kinit_cmd} hbase shell {hbase_grant_premissions_file}")
File( hbase_grant_premissions_file,
owner = params.hbase_user,
http://git-wip-us.apache.org/repos/asf/ambari/blob/55610280/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/service_check.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/service_check.py
index ff6d0ed..980c630 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/service_check.py
@@ -29,7 +29,6 @@ class HbaseServiceCheck(Script):
output_file = "/apps/hbase/data/ambarismoketest"
test_cmd = format("fs -test -e {output_file}")
- kinit_cmd = format("{kinit_path_local} -kt {smoke_user_keytab} {smoke_test_user};") if params.security_enabled else ""
hbase_servicecheck_file = '/tmp/hbase-smoke.sh'
File( '/tmp/hbaseSmokeVerify.sh',
@@ -44,8 +43,7 @@ class HbaseServiceCheck(Script):
if params.security_enabled:
hbase_grant_premissions_file = '/tmp/hbase_grant_permissions.sh'
- hbase_kinit_cmd = format("{kinit_path_local} -kt {hbase_user_keytab} {hbase_user};")
- grantprivelegecmd = format("{hbase_kinit_cmd} hbase shell {hbase_grant_premissions_file}")
+ grantprivelegecmd = format("{kinit_cmd} hbase shell {hbase_grant_premissions_file}")
File( hbase_grant_premissions_file,
owner = params.hbase_user,