AMBARI-1667. Starting all services fails on secure cluster (excluding HBase and ZooKeeper). (swagle)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1458596 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -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)
 

ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp

@@ -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]