You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2013/03/20 01:41:55 UTC

svn commit: r1458596 - in /incubator/ambari/trunk: CHANGES.txt ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp

Author: swagle
Date: Wed Mar 20 00:41:55 2013
New Revision: 1458596

URL: http://svn.apache.org/r1458596
Log:
AMBARI-1667. Starting all services fails on secure cluster (excluding HBase and ZooKeeper). (swagle)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1458596&r1=1458595&r2=1458596&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed Mar 20 00:41:55 2013
@@ -502,6 +502,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1667. Starting all services fails on secure cluster (excluding 
+ HBase and ZooKeeper). (swagle)
+
  AMBARI-1666. Oozie properties for principal and keytab not read from 
  oozie-site. (swagle)
 

Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp?rev=1458596&r1=1458595&r2=1458596&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp Wed Mar 20 00:41:55 2013
@@ -116,19 +116,18 @@ class hdp::create_smoke_user()
   }
   
   hdp::user { $smoke_user: 
-              gid    => $hdp::params::user_group,
-              groups => ["$proxyuser_group"]
+    gid    => $hdp::params::user_group,
+    groups => ["$proxyuser_group"]
   }
 
-  if ($security_enabled == true) {
-    $secure_uid = $hdp::params::smoketest_user_secure_uid
-    $cmd_set_uid = "usermod -u ${secure_uid} ${smoke_user}"
-    $cmd_set_uid_check = "id -u ${smoke_user} | grep ${secure_uid}"
-     hdp::exec{ $cmd_set_uid:
-       command => $cmd_set_uid,
-       unless => $cmd_set_uid_check,
-       require => Hdp::User[$smoke_user]
-     }
+  ## Set smoke user uid to > 1000 for enable security feature
+  $secure_uid = $hdp::params::smoketest_user_secure_uid
+  $cmd_set_uid = "usermod -u ${secure_uid} ${smoke_user}"
+  $cmd_set_uid_check = "id -u ${smoke_user} | grep ${secure_uid}"
+  hdp::exec{ $cmd_set_uid:
+   command => $cmd_set_uid,
+   unless => $cmd_set_uid_check,
+   require => Hdp::User[$smoke_user]
   }
 
   Group<||> -> Hdp::User[$smoke_user]