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/11 19:56:44 UTC

git commit: AMBARI-4611. ZKFailoverController start fails in security wizard after enabling HA (aonishuk)

Updated Branches:
  refs/heads/trunk e66d84f8a -> 6497bc919


AMBARI-4611. ZKFailoverController start fails in security wizard after
enabling HA (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6497bc91
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6497bc91
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6497bc91

Branch: refs/heads/trunk
Commit: 6497bc91967b0152bee94bfc64e67873bc629d8f
Parents: e66d84f
Author: Andrew Onischuk <ao...@hortonworks.com>
Authored: Tue Feb 11 10:46:58 2014 -0800
Committer: Andrew Onischuk <ao...@hortonworks.com>
Committed: Tue Feb 11 10:46:58 2014 -0800

----------------------------------------------------------------------
 .../stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/6497bc91/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
index 017a47a..aafdeee 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
@@ -42,7 +42,7 @@ def service(action=None, name=None, user=None, create_pid_dir=False,
               owner=user,
               recursive=True)
 
-  if params.security_enabled:
+  if params.security_enabled and name != "zkfc":
     principal_replaced = principal.replace("_HOST", params.hostname)
     kinit_cmd = format("kinit -kt {keytab} {principal_replaced}")