AMBARI-7465. Ambari kinits with basic user for hbase instead of using principal name (alejandro)

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py

@@ -36,6 +36,7 @@ hbase_drain_only = config['commandParams']['mark_draining_only']
 hbase_included_hosts = config['commandParams']['included_hosts']
 
 hbase_user = status_params.hbase_user
+hbase_principal_name = config['configurations']['hbase-env']['hbase_principal_name']
 smokeuser = config['configurations']['cluster-env']['smokeuser']
 security_enabled = config['configurations']['cluster-env']['security_enabled']
 user_group = config['configurations']['cluster-env']['user_group']
@@ -82,7 +83,7 @@ smoke_user_keytab = config['configurations']['cluster-env']['smokeuser_keytab']
 hbase_user_keytab = config['configurations']['hbase-env']['hbase_user_keytab']
 kinit_path_local = functions.get_kinit_path(["/usr/bin", "/usr/kerberos/bin", "/usr/sbin"])
 if security_enabled:
-  kinit_cmd = format("{kinit_path_local} -kt {hbase_user_keytab} {hbase_user};")
+  kinit_cmd = format("{kinit_path_local} -kt {hbase_user_keytab} {hbase_principal_name};")
 else:
   kinit_cmd = ""
 

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/service_check.py

@@ -41,8 +41,8 @@ class HbaseServiceCheck(Script):
       mode = 0755,
       content = Template('hbase-smoke.sh.j2')
     )
-    
-    if params.security_enabled:    
+
+    if params.security_enabled:
       hbase_grant_premissions_file = format("{exec_tmp_dir}/hbase_grant_permissions.sh")
       grantprivelegecmd = format("{kinit_cmd} hbase shell {hbase_grant_premissions_file}")
   

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py

@@ -55,6 +55,7 @@ hbase_drain_only = config['commandParams']['mark_draining_only']
 hbase_included_hosts = config['commandParams']['included_hosts']
 
 hbase_user = status_params.hbase_user
+hbase_principal_name = config['configurations']['hbase-env']['hbase_principal_name']
 smokeuser = config['configurations']['cluster-env']['smokeuser']
 _authentication = config['configurations']['core-site']['hadoop.security.authentication']
 security_enabled = config['configurations']['cluster-env']['security_enabled']
@@ -108,7 +109,7 @@ smoke_user_keytab = config['configurations']['cluster-env']['smokeuser_keytab']
 hbase_user_keytab = config['configurations']['hbase-env']['hbase_user_keytab']
 kinit_path_local = functions.get_kinit_path(["/usr/bin", "/usr/kerberos/bin", "/usr/sbin"])
 if security_enabled:
-  kinit_cmd = format("{kinit_path_local} -kt {hbase_user_keytab} {hbase_user};")
+  kinit_cmd = format("{kinit_path_local} -kt {hbase_user_keytab} {hbase_principal_name};")
 else:
   kinit_cmd = ""
 

ambari-server/src/test/python/stacks/1.3.2/configs/secured.json

@@ -179,7 +179,7 @@
             "namenode_principal_name": "nn/_HOST", 
             "namenode_keytab": "/etc/security/keytabs/nn.service.keytab", 
             "nagios_principal_name": "nagios/c6402.ambari.apache.org@EXAMPLE.COM", 
-            "dfs_datanode_http_address": "1022", 
+            "dfs_datanode_http_address": "1022",
             "hbase_user_keytab": "/etc/security/keytabs/hbase.headless.keytab", 
             "jobtracker_primary_name": "jt", 
             "hbase_pid_dir": "/var/run/hbase", 
@@ -561,7 +561,8 @@
         }, 
         "hbase-env": {
             "hbase_pid_dir": "/var/run/hbase", 
-            "hbase_user": "hbase", 
+            "hbase_user": "hbase",
+            "hbase_principal_name": "hbase",
             "hbase_master_heapsize": "1024m",
             "hbase_regionserver_xmn_max": "512m",
             "hbase_regionserver_xmn_ratio": "0.2",

ambari-web/app/data/HDP2/secure_properties.js

@@ -152,6 +152,7 @@ module.exports =
       "isOverridable": false,
       "isReconfigurable": false,
       "serviceName": "GENERAL",
+      "filename": "hbase-env.xml",
       "category": "AMBARI"
     },
     {

ambari-web/app/data/secure_properties.js

@@ -154,6 +154,7 @@ module.exports =
       "isOverridable": false,
       "isReconfigurable": false,
       "serviceName": "GENERAL",
+      "filename": "hbase-env.xml",
       "category": "AMBARI"
     },
     {