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/26 12:20:07 UTC

git commit: AMBARI-4836. Hbase service check fails on Security with camel hostnames (aonishuk)

Repository: ambari
Updated Branches:
  refs/heads/trunk a46484e4b -> c4a2523e0


AMBARI-4836. Hbase service check fails on Security with camel hostnames
(aonishuk)


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

Branch: refs/heads/trunk
Commit: c4a2523e0cdc06d847336b2073cb621c67b3acc3
Parents: a46484e
Author: Andrew Onischuk <ao...@hortonworks.com>
Authored: Wed Feb 26 03:16:47 2014 -0800
Committer: Andrew Onischuk <ao...@hortonworks.com>
Committed: Wed Feb 26 03:19:49 2014 -0800

----------------------------------------------------------------------
 .../stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py  | 6 +++---
 .../stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/c4a2523e/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py
index 54f3990..f2ec497 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py
@@ -71,15 +71,15 @@ if security_enabled:
   
   _use_hostname_in_principal = default('instance_name', True)
   _master_primary_name = config['configurations']['global']['hbase_master_primary_name']
-  _hostname = config['hostname']
+  _hostname_lowercase = config['hostname'].lower()
   _kerberos_domain = config['configurations']['global']['kerberos_domain']
   _master_principal_name = config['configurations']['global']['hbase_master_principal_name']
   _regionserver_primary_name = config['configurations']['global']['hbase_regionserver_primary_name']
 
 
   if _use_hostname_in_principal:
-    master_jaas_princ = format("{_master_primary_name}/{_hostname}@{_kerberos_domain}")
-    regionserver_jaas_princ = format("{_regionserver_primary_name}/{_hostname}@{_kerberos_domain}")
+    master_jaas_princ = format("{_master_primary_name}/{_hostname_lowercase}@{_kerberos_domain}")
+    regionserver_jaas_princ = format("{_regionserver_primary_name}/{_hostname_lowercase}@{_kerberos_domain}")
   else:
     master_jaas_princ = format("{_master_principal_name}@{_kerberos_domain}")
     regionserver_jaas_princ = format("{_regionserver_primary_name}@{_kerberos_domain}")

http://git-wip-us.apache.org/repos/asf/ambari/blob/c4a2523e/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py
index ecdb843..68b22da 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py
@@ -71,14 +71,14 @@ if security_enabled:
   
   _use_hostname_in_principal = default('instance_name', True)
   _master_primary_name = config['configurations']['global']['hbase_master_primary_name']
-  _hostname = config['hostname']
+  _hostname_lowercase = config['hostname'].lower()
   _kerberos_domain = config['configurations']['global']['kerberos_domain']
   _master_principal_name = config['configurations']['global']['hbase_master_principal_name']
   _regionserver_primary_name = config['configurations']['global']['hbase_regionserver_primary_name']
   
   if _use_hostname_in_principal:
-    master_jaas_princ = format("{_master_primary_name}/{_hostname}@{_kerberos_domain}")
-    regionserver_jaas_princ = format("{_regionserver_primary_name}/{_hostname}@{_kerberos_domain}")
+    master_jaas_princ = format("{_master_primary_name}/{_hostname_lowercase}@{_kerberos_domain}")
+    regionserver_jaas_princ = format("{_regionserver_primary_name}/{_hostname_lowercase}@{_kerberos_domain}")
   else:
     master_jaas_princ = format("{_master_principal_name}@{_kerberos_domain}")
     regionserver_jaas_princ = format("{_regionserver_primary_name}@{_kerberos_domain}")