You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2013/12/04 02:49:56 UTC

git commit: AMBARI-3966. Secure cluster: task-controller binary should be owned by the group specified in taskcontroller.cfg (jaimin)

Updated Branches:
  refs/heads/trunk 60c1d70a2 -> 7c5e2499f


AMBARI-3966. Secure cluster: task-controller binary should be owned by the group specified in taskcontroller.cfg (jaimin)


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

Branch: refs/heads/trunk
Commit: 7c5e2499fee3be218c8ea7fa3891fe89387f3afc
Parents: 60c1d70
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Tue Dec 3 17:49:24 2013 -0800
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Tue Dec 3 17:49:38 2013 -0800

----------------------------------------------------------------------
 ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp | 2 +-
 ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/init.pp   | 2 +-
 ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/7c5e2499/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
index 1b69e12..fdcd4e3 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
+++ b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
@@ -290,7 +290,7 @@ class hdp-hadoop(
     if ($hdp::params::security_enabled == true) {
       file { "${hdp::params::hadoop_bin}/task-controller":
         owner   => 'root',
-        group   => $hdp::params::user_group,
+        group   => $hdp::params::mapred_tt_group,
         mode    => '6050',
         require => Hdp-hadoop::Package['hadoop'],
         before  => Anchor['hdp-hadoop::end']

http://git-wip-us.apache.org/repos/asf/ambari/blob/7c5e2499/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/init.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/init.pp
index a8bbf80..5d74f86 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/init.pp
+++ b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/init.pp
@@ -152,7 +152,7 @@ define hdp-yarn::generate_common_configs() {
     $container_executor = "${hdp::params::yarn_container_bin}/container-executor"
     file { $container_executor:
       ensure => present,
-      group => $hdp::params::user_group,
+      group => $hdp-yarn::params::yarn_executor_container_group,
       mode => 6050
     }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/7c5e2499/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp
index da69693..9fa897a 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp
+++ b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp
@@ -28,6 +28,7 @@ class hdp-yarn::params(
   ## security params
   $security_enabled = $hdp::params::security_enabled
   $smoke_user_keytab = $hdp::params::smokeuser_keytab
+  $yarn_executor_container_group = hdp_default("yarn-site/yarn.nodemanager.linux-container-executor.group","hadoop")
   $kinit_cmd = "${hdp::params::kinit_path_local} -kt ${smoke_user_keytab} ${smoke_test_user};"
   $rm_host = $hdp::params::rm_host
   $rm_port = $hdp::rm_port