Ver Fonte

AMBARI-2065. Hadoop group customization does not take affect. (smohanty)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1478142 13f79535-47bb-0310-9956-ffa450edef68
Sumit Mohanty há 12 anos atrás
pai
commit
c18e5de41e

+ 2 - 0
CHANGES.txt

@@ -823,6 +823,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-2065. Hadoop group customization does not take affect. (smohanty)
+
  AMBARI-2062. Service versions shown during install dont match installed
  versions. (smohanty)
 

+ 6 - 2
ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp

@@ -226,9 +226,13 @@ class hdp-hadoop(
       group => $hdp::params::user_group
     }
  
-    hdp::user{ $hdfs_user:}
+    hdp::user{ $hdfs_user:
+      groups => [$hdp::params::user_group, $hdfs_user]
+    }
     if ($hdfs_user != $mapred_user) {
-      hdp::user { $mapred_user:}
+      hdp::user { $mapred_user:
+        groups => [$hdp::params::user_group, $mapred_user]
+      }
     }
 
     $logdirprefix = $hdp-hadoop::params::hdfs_log_dir_prefix

+ 1 - 1
ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp

@@ -60,7 +60,7 @@ class hdp-hadoop::namenode(
         keytabfile => 'spnego.service.keytab', 
         owner => $hdp-hadoop::params::hdfs_user, 
         mode => '0440',
-        group => 'hadoop'
+        group => $hdp::params::user_group
       }
     }
  

+ 1 - 1
ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/snamenode.pp

@@ -52,7 +52,7 @@ class hdp-hadoop::snamenode(
           keytabfile => 'spnego.service.keytab', 
           owner => $hdp-hadoop::params::hdfs_user,
           mode => '0440',
-          group => 'hadoop'
+          group => $hdp::params::user_group
         }
       }
     }

+ 1 - 1
ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/taskcontroller.cfg.erb

@@ -16,5 +16,5 @@
 # * limitations under the License.
 # */
 mapred.local.dir=<%=scope.function_hdp_template_var("mapred_local_dir")%>
-mapreduce.tasktracker.group=hadoop
+mapreduce.tasktracker.group=<%=scope.function_hdp_default(["mapred-site/mapreduce.tasktracker.group","hadoop"])%>
 hadoop.log.dir=<%=scope.function_hdp_template_var("hdfs_log_dir_prefix")%>/<%=scope.function_hdp_template_var("mapred_user")%>

+ 3 - 1
ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp

@@ -81,7 +81,9 @@ class hdp-hbase(
   } else {  
     hdp::package { 'hbase': }
   
-    hdp::user{ $hbase_user:}
+    hdp::user{ $hbase_user:
+      groups => [$hdp::params::user_group, $hbase_user]
+    }
  
     hdp::directory { $config_dir: 
       service_state => $service_state,

+ 1 - 1
ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/server.pp

@@ -45,7 +45,7 @@ class hdp-oozie::server(
            keytabdst => "${$keytab_path}/spnego.service.keytab",
            keytabfile => 'spnego.service.keytab',
            owner => $hdp::params::oozie_user,
-           group => 'hadoop',
+           group => $hdp::params::user_group,
            mode => '0440'
          }
       }

+ 1 - 1
ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/server.pp

@@ -49,7 +49,7 @@ class hdp-templeton::server(
          keytabdst => "${$keytab_path}/spnego.service.keytab",
          keytabfile => 'spnego.service.keytab',
          owner => $hdp::params::templeton_user,
-         group => 'hadoop',
+         group => $hdp::params::user_group,
          mode => '0440'
        }
      }