svn commit: r1493979 - in /incubator/ambari/trunk: ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/hbase/ ambari-agent/src/main/puppet/modules/hdp-hcat/manifests/hcat/ ambari-agent/src/main/puppet/modules/hdp-hive/manifests/hive/ ambari-agent/...

[ja...@apache.org]

Author: jaimin
Date: Tue Jun 18 00:03:55 2013
New Revision: 1493979

URL: http://svn.apache.org/r1493979
Log:
AMBARI-2409. Security Wizard: Path to smoke test user keytab file should be customizable via web-ui. (jaimin)

Modified:
    incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/hbase/service_check.pp
    incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hcat/manifests/hcat/service_check.pp
    incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/hive/service_check.pp
    incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/oozie/service_check.pp
    incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-sqoop/manifests/sqoop/service_check.pp
    incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/templeton/service_check.pp
    incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
    incubator/ambari/trunk/ambari-web/app/data/secure_properties.js

Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/hbase/service_check.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/hbase/service_check.pp?rev=1493979&r1=1493978&r2=1493979&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/hbase/service_check.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/hbase/service_check.pp Tue Jun 18 00:03:55 2013
@@ -24,7 +24,7 @@ class hdp-hbase::hbase::service_check() 
   $security_enabled = $hdp::params::security_enabled
   $output_file = "/apps/hbase/data/ambarismoketest"
   $conf_dir = $hdp::params::hbase_conf_dir
-  $smoke_user_keytab = "${hdp-hbase::params::keytab_path}/${smoke_test_user}.headless.keytab"
+  $smoke_user_keytab = $hdp::params::smokeuser_keytab
   $hbase_user = $hdp-hbase::params::hbase_user
   $hbase_keytab = "${hdp-hbase::params::keytab_path}/${hbase_user}.headless.keytab"
   $test_cmd = "fs -test -e ${output_file}"

Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hcat/manifests/hcat/service_check.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hcat/manifests/hcat/service_check.pp?rev=1493979&r1=1493978&r2=1493979&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hcat/manifests/hcat/service_check.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hcat/manifests/hcat/service_check.pp Tue Jun 18 00:03:55 2013
@@ -25,7 +25,7 @@ class hdp-hcat::hcat::service_check() 
   $smoke_test_user = $hdp::params::smokeuser
   $output_file = "/apps/hive/warehouse/hcatsmoke${unique}"
   $security_enabled=$hdp::params::security_enabled
-  $smoke_user_keytab = "${hdp-hcat::params::keytab_path}/${smoke_test_user}.headless.keytab"
+  $smoke_user_keytab = $hdp::params::smokeuser_keytab
 
   if ($security_enabled == true) {
     $smoke_user_kinitcmd="${kinit_path_local} -kt ${smoke_user_keytab} ${smoke_test_user}; "

Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/hive/service_check.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/hive/service_check.pp?rev=1493979&r1=1493978&r2=1493979&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/hive/service_check.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/hive/service_check.pp Tue Jun 18 00:03:55 2013
@@ -24,7 +24,7 @@ class hdp-hive::hive::service_check() in
   $smoke_test_sql = "/tmp/$smoke_test_sql_file"
   $smoke_test_path = "/tmp/$smoke_test_script"
   $security_enabled = $hdp::params::security_enabled
-  $smoke_user_keytab = "${hdp-hive::params::keytab_path}/${smoke_test_user}.headless.keytab"
+  $smoke_user_keytab = $hdp::params::smokeuser_keytab
 
   if ($security_enabled == true) {
     $kinit_cmd = "${hdp::params::kinit_path_local} -kt ${smoke_user_keytab} ${smoke_test_user};"

Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/oozie/service_check.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/oozie/service_check.pp?rev=1493979&r1=1493978&r2=1493979&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/oozie/service_check.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/oozie/service_check.pp Tue Jun 18 00:03:55 2013
@@ -43,7 +43,7 @@ define hdp-oozie::smoke_shell_file()
   } else {
     $security = "false"
   }
-  $smoke_user_keytab = "${hdp-oozie::params::keytab_path}/${smoke_test_user}.headless.keytab"
+  $smoke_user_keytab = $hdp::params::smokeuser_keytab
   $realm=$hdp::params::kerberos_domain
 
   file { '/tmp/oozieSmoke.sh':

Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-sqoop/manifests/sqoop/service_check.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-sqoop/manifests/sqoop/service_check.pp?rev=1493979&r1=1493978&r2=1493979&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-sqoop/manifests/sqoop/service_check.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-sqoop/manifests/sqoop/service_check.pp Tue Jun 18 00:03:55 2013
@@ -25,7 +25,7 @@ class hdp-sqoop::sqoop::service_check() 
 
   # TODO:SUHAS Move this to hdp::params
   $security_enabled=$hdp::params::security_enabled
-  $smoke_user_keytab = "${hdp-sqoop::params::keytab_path}/${smoke_test_user}.headless.keytab"
+  $smoke_user_keytab = $hdp::params::smokeuser_keytab
   if ($security_enabled == true) {
     $smoke_user_kinitcmd="${kinit_path_local}  -kt ${smoke_user_keytab} ${smoke_test_user}; "
   } else {

Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/templeton/service_check.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/templeton/service_check.pp?rev=1493979&r1=1493978&r2=1493979&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/templeton/service_check.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/templeton/service_check.pp Tue Jun 18 00:03:55 2013
@@ -29,7 +29,7 @@ class hdp-templeton::templeton::service_
     $security = "false"
   }
   $kinit_path_local = $hdp::params::kinit_path_local
-  $smoke_user_keytab = "${hdp-templeton::params::keytab_path}/${smoke_test_user}.headless.keytab"
+  $smoke_user_keytab = $hdp::params::smokeuser_keytab
 
   $templeton_host = $hdp::params::webhcat_server_host
 

Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp?rev=1493979&r1=1493978&r2=1493979&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp Tue Jun 18 00:03:55 2013
@@ -55,6 +55,7 @@ class hdp::params()
   $kinit_path_local = hdp_default("kinit_path_local","/usr/bin/kinit")
   $keytab_path = hdp_default("keytab_path", "/etc/security/keytabs")
   $use_hostname_in_principal = hdp_default("instance_name", true)
+  $smokeuser_keytab = hdp_default("smokeuser_keytab", "/etc/security/keytabs/smokeuser.headless.keytab")
 
   ###### hostnames
   $namenode_host = hdp_default("namenode_host")

Modified: incubator/ambari/trunk/ambari-web/app/data/secure_properties.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/secure_properties.js?rev=1493979&r1=1493978&r2=1493979&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/secure_properties.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/secure_properties.js Tue Jun 18 00:03:55 2013
@@ -121,6 +121,19 @@ module.exports =
       "serviceName": "GENERAL",
       "category": "KERBEROS"
     },
+    {
+      "id": "puppet var",
+      "name": "smokeuser_keytab",
+      "displayName": "Path to smoke test user keytab file",
+      "value": "",
+      "defaultValue": "/etc/security/keytabs/smokeuser.headless.keytab",
+      "description": "Path to keytab file for smoke test user",
+      "displayType": "directory",
+      "isVisible": true,
+      "isOverridable": false,
+      "serviceName": "GENERAL",
+      "category": "KERBEROS"
+    },
 
     //HDFS
     {